pkgsrc-WIP-changes archive

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

compat32_fontconfig: Unlink libs and *.pc files of fontconfig and freetype



Module Name:	pkgsrc-wip
Committed By:	Naveen Narayanan <zerous@nocebo.space>
Pushed By:	zerous
Date:		Wed Jul 24 23:42:20 2019 +0200
Changeset:	4e16f2309f84d49232e6b6f3444e3cb0a623e12e

Modified Files:
	compat32_fontconfig/Makefile

Log Message:
compat32_fontconfig: Unlink libs and *.pc files of fontconfig and freetype

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=4e16f2309f84d49232e6b6f3444e3cb0a623e12e

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 compat32_fontconfig/Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diffs:
diff --git a/compat32_fontconfig/Makefile b/compat32_fontconfig/Makefile
index aa7453b6cb..4c012e075b 100644
--- a/compat32_fontconfig/Makefile
+++ b/compat32_fontconfig/Makefile
@@ -96,9 +96,10 @@ TEST_TARGET=	check
 CONFIGURE_ENV+=	CC_FOR_BUILD=${NATIVE_CC:Q}
 .endif
 
+# XXX: Unlink libs and *.pc files of fontconfig and freetype that comes with compat80-x11
 pre-configure:
 	cd ${BUILDLINK_X11_DIR} && ${FIND} . -path "*fontconfig*" -type l -delete
-	cd ${BUILDLINK_X11_DIR}/emul/netbsd32/lib && find . -name "*freetype*" -maxdepth 1 -type l -delete
+	cd ${BUILDLINK_X11_DIR}/emul/netbsd32/lib && find . -name "*freetype*" -maxdepth 1 -type l -delete && find ./pkgconfig/ -name "*freetype2.pc*" -type l -delete
 
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/30-pkgsrc-aliases.conf ${DESTDIR}${TMPLDIR}
@@ -109,7 +110,7 @@ post-install:
 .include "../../wip/compat32_libuuid/buildlink3.mk"
 .endif
 .include "../../devel/zlib/buildlink3.mk"
-BUILDLINK_API_DEPENDS.freetype2+=	freetype2>=2.8.1
+BUILDLINK_API_DEPENDS.compat32_freetype2+=	freetype2>=2.8.1
 .include "../../wip/compat32_freetype2/buildlink3.mk"
 .include "../../wip/compat80-x11/buildlink3.mk"
 .include "../../wip/compat32_expat/buildlink3.mk"


Home | Main Index | Thread Index | Old Index