--- Begin Message ---
| To: pkgsrc-changes%NetBSD.org@localhost
| From: "Joerg Sonnenberger" <joerg%netbsd.org@localhost>
| Subject: CVS commit: pkgsrc/fonts/fontconfig
| Date: Thu, 6 Sep 2018 15:27:21 +0000
| Message-ID: <20180906152722.02AABFBF8%cvs.NetBSD.org@localhost>
> Date: Thu Sep 6 15:27:21 UTC 2018
> Modified Files:
> pkgsrc/fonts/fontconfig: Makefile
> Log Message:
> Repeat after me: I have never ever used .../.libs directly.
This change breaks package build reported by @tristelo (at twitter).
and I've reproduced it (on at least 8.99.25) as:
fc-cache.o: In function `scanDirs':
fc-cache.c:(.text+0x452): undefined reference to `FcDirCacheCreateUUID'
gmake[2]: *** [Makefile:516: fc-cache] Error 1
gmake[2]: Leaving directory '/WRKOBJDIR/fonts/fontconfig/work/fontconfig-2.13.1/fc-cache'
gmake[1]: *** [Makefile:603: all-recursive] Error 1
gmake[1]: Leaving directory '/WRKOBJDIR/fonts/fontconfig/work/fontconfig-2.13.1'
gmake: *** [Makefile:487: all] Error 2
*** Error code 2
Stop.
make[1]: stopped in /usr/pkgsrc/fonts/fontconfig
*** Error code 1
How about the change attached:
Thank you,
--
Makoto Fujiwara
mef%NetBSD.org@localhost
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/fonts/fontconfig/Makefile,v
retrieving revision 1.112
diff -u -r1.112 Makefile
--- Makefile 2 Sep 2018 20:30:43 -0000 1.112
+++ Makefile 9 Sep 2018 15:09:03 -0000
@@ -90,7 +90,7 @@
.endif
.if ${X11_TYPE} != "modular" && exists(${X11BASE}/lib/libfontconfig.so)
-LDFLAGS+= -L../src/.libs
+LDFLAGS+= -lfontconfig -L../src/
.endif
post-install:
(or diff from current)
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/fonts/fontconfig/Makefile,v
retrieving revision 1.113
diff -u -r1.113 Makefile
--- Makefile 6 Sep 2018 15:27:21 -0000 1.113
+++ Makefile 9 Sep 2018 15:09:55 -0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.113 2018/09/06 15:27:21 joerg Exp $
+# $NetBSD: Makefile,v 1.112 2018/09/02 20:30:43 wiz Exp $
DISTNAME= fontconfig-2.13.1
CATEGORIES= fonts
@@ -89,6 +89,10 @@
CONFIGURE_ENV+= CC_FOR_BUILD=${NATIVE_CC:Q}
.endif
+.if ${X11_TYPE} != "modular" && exists(${X11BASE}/lib/libfontconfig.so)
+LDFLAGS+= -lfontconfig -L../src/
+.endif
+
post-install:
${INSTALL_DATA} ${FILESDIR}/30-pkgsrc-aliases.conf ${DESTDIR}${TMPLDIR}
--
Makoto Fujiwara
mef%NetBSD.org@localhost
--- End Message ---