summaryrefslogtreecommitdiff
path: root/fonts
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2016-09-18 13:18:20 +0000
committerwiz <wiz@pkgsrc.org>2016-09-18 13:18:20 +0000
commit495ee14aa97f8fce10584bf054fbd7ca8ee88af1 (patch)
tree138f5dcfc38ee24a40fbafde02810d5f895261f2 /fonts
parent2dd09e6287ef578da847ce5a353452476bc8eb80 (diff)
downloadpkgsrc-495ee14aa97f8fce10584bf054fbd7ca8ee88af1.tar.gz
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 (limited to 'fonts')
-rw-r--r--fonts/fontconfig/Makefile6
1 files changed, 5 insertions, 1 deletions
diff --git a/fonts/fontconfig/Makefile b/fonts/fontconfig/Makefile
index de47f4efe71..45d0d29093c 100644
--- a/fonts/fontconfig/Makefile
+++ b/fonts/fontconfig/Makefile
@@ -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 @@ TEST_TARGET= check
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}