tech-pkg archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Re: Making builtin fontconfig usable again on NetBSD (or, why libuuid bl3 is included in fontconfig bl3?)

Leonardo Taccari writes:
> [...]
> If there won't be any negative feedbacks I would like to commit this
> patch in 2 weeks.
> [...]

Sorry, please ignore all the unrelated diffs/debug left-over
in previous patch and the previous patch also had a problem with `yes'
not properly spelled (missing `s' when checking it).

Attaching again a fixed version of it.
fontconfig: Adjust to possibly use builtin one in NetBSD

In NetBSD, builtin fontconfig has an internal and with symbols
renamed libuuid (libuuid_ul). Avoid including it in that case.

Problem originally analyzed by <wiz> in:


XXX: As <mrg> pointed out in that thread probably uuid bl3 should not
XXX: be included there at all. `cvs annotate' and `cvs log' does not
XXX: contain any rationale in adding it.

RCS file: /cvsroot/pkgsrc/fonts/fontconfig/,v
retrieving revision 1.37
diff -u -p -r1.37
---	9 Sep 2019 12:22:03 -0000	1.37
+++	10 Jul 2020 12:03:52 -0000
@@ -5,14 +5,24 @@ BUILDLINK_TREE+=	fontconfig
+.if !defined(USE_BUILTIN.fontconfig)
+CHECK_BUILTIN.fontconfig:=	yes
+.  include "../../fonts/fontconfig/"
+CHECK_BUILTIN.fontconfig:=	no
 BUILDLINK_API_DEPENDS.fontconfig+=	fontconfig>=2.11.91
 BUILDLINK_ABI_DEPENDS.fontconfig+=	fontconfig>=2.13.0
 BUILDLINK_PKGSRCDIR.fontconfig?=	../../fonts/fontconfig
+.  include "../../mk/"
 .include "../../archivers/bzip2/"
 .include "../../devel/gettext-lib/"
 .include "../../devel/zlib/"
+.  if !empty(USE_BUILTIN.fontconfig:M[Yy][Ee][Ss]) && ${OPSYS} == "NetBSD"
 .include "../../devel/libuuid/"
+.  endif
 .include "../../graphics/freetype2/"
 .include "../../textproc/expat/"

Home | Main Index | Thread Index | Old Index