Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move xorg-server.pc's SDK_REQUIRED_MODULES into the local Makefile.

Browse Source
This commit is contained in:
mrg 2014-12-30 22:07:21 +00:00
parent 3c14839044
commit fbfbb2ece8
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
external/mit/xorg/server/xorg-server/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.21 2014/03/23 20:40:18 mrg Exp $
# $NetBSD: Makefile,v 1.22 2014/12/30 22:07:21 mrg Exp $
.include <bsd.own.mk>
@ -23,6 +23,7 @@ PKGCONFIG= xorg-server
# Use -fvisibility=hidden for symbol_visibility?
PKGCONFIG_SED_FLAGS= \
-e "s,@sysconfigdir@,${X11ETCDIR},; \
s,@SDK_REQUIRED_MODULES@,xproto >= 7.0.17 randrproto >= 1.2.99.3 renderproto >= 0.11 xextproto >= 7.1.99 inputproto >= 1.9.99.902 kbproto >= 1.0.3 fontsproto,; \
s,@symbol_visibility@,,"
.include <bsd.x11.mk>

7
share/mk/bsd.x11.mk
View File

@ -1,4 +1,4 @@
# $NetBSD: bsd.x11.mk,v 1.113 2014/07/16 14:10:26 nakayama Exp $
# $NetBSD: bsd.x11.mk,v 1.114 2014/12/30 22:07:21 mrg Exp $
.include <bsd.init.mk>
@ -345,15 +345,14 @@ ${_pkg}.pc: ${PKGDIST.${_pkg}}/configure Makefile
s,@abi_extension@,2.0,; \
s,@abi_font@,0.6,; \
s,@fchown_define@,-DHAS_FCHOWN,; \
s,@sticky_bit_define@,-DHAS_STICKY_DIR_BIT," \
s,@sticky_bit_define@,-DHAS_STICKY_DIR_BIT,;" \
-e "s,@PKG_CONFIG_LIBS@,${PKG_CONFIG_LIBS},; \
s,@PACKAGE@,${PKGDIST},; \
s,@PKGCONFIG_REQUIRES@,${PKGCONFIG_REQUIRES},; \
s,@PKGCONFIG_REQUIRES_PRIVATELY@,${PKGCONFIG_REQUIRES_PRIVATELY},; \
s,@ERRORDBDIR@,${X11LIBDIR},; \
s,@EXPAT_CFLAGS@,,; \
s,@FREETYPE_CFLAGS@,-I${X11ROOTDIR}/include/freetype2 -I${X11ROOTDIR}/include,; \
s,@SDK_REQUIRED_MODULES@,xproto >= 7.0.17 randrproto >= 1.2.99.3 renderproto >= 0.11 xextproto >= 7.1.99 inputproto >= 1.9.99.902 kbproto >= 1.0.3 fontsproto," \
s,@FREETYPE_CFLAGS@,-I${X11ROOTDIR}/include/freetype2 -I${X11ROOTDIR}/include,;" \
-e '/^Libs:/ s%-L\([^ ]*\)%-Wl,-rpath,\1 &%g' \
< ${.IMPSRC} > ${.TARGET}.tmp && \
mv -f ${.TARGET}.tmp ${.TARGET}