pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/fonts/fontconfig Fix build with native X.org.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/cbb71d81ecb4
branches:  trunk
changeset: 352688:cbb71d81ecb4
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sun Sep 18 13:18:20 2016 +0000

description:
Fix build with native X.org.

The installed version of this library was found and used instead of the
one build by the package, leading to problems when the pkgsrc one had
symbols the native one doesn't have. Add libtool path to compiler
search path to fix this.

>From spz.

diffstat:

 fonts/fontconfig/Makefile |  6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diffs (20 lines):

diff -r c7ebdceeeb07 -r cbb71d81ecb4 fonts/fontconfig/Makefile
--- a/fonts/fontconfig/Makefile Sun Sep 18 12:47:28 2016 +0000
+++ b/fonts/fontconfig/Makefile Sun Sep 18 13:18:20 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.96 2016/08/19 12:52:30 wiz Exp $
+# $NetBSD: Makefile,v 1.97 2016/09/18 13:18:20 wiz Exp $
 
 DISTNAME=      fontconfig-2.12.1
 CATEGORIES=    fonts
@@ -86,6 +86,10 @@
 CONFIGURE_ENV+=        CC_FOR_BUILD=${NATIVE_CC:Q}
 .endif
 
+.if ${X11_TYPE} != "modular" && exists(${X11BASE}/lib/libfontconfig.so)
+LDFLAGS+=      -L../src/.libs
+.endif
+
 post-install:
        ${INSTALL_DATA} ${FILESDIR}/30-pkgsrc-aliases.conf ${DESTDIR}${TMPLDIR}
 



Home | Main Index | Thread Index | Old Index