diff options
| author | mrg <mrg@NetBSD.org> | 2014-03-23 20:40:18 +0000 |
|---|---|---|
| committer | mrg <mrg@NetBSD.org> | 2014-03-23 20:40:18 +0000 |
| commit | e4f575f653b81eedd4fa7dafe01b0b0cb7fc5ccc (patch) | |
| tree | 6cbec7ce0cf0b59b56bece351bf52cbf304bcca5 | |
| parent | c7789b672eff1c04713f05dc87260b09861efdb0 (diff) | |
allow for .pc substitutions to be listed per makefile
(could maybe do per-target, as well.) fix the remaining
substitutions for xcb-proto, fontconfig and xorg-server.
(XXX: move many per-package-specific parts out of
bsd.x11.mk itself, into the relevant Makefile.)
| -rw-r--r-- | external/mit/xorg/include/xcb-proto/Makefile | 4 | ||||
| -rw-r--r-- | external/mit/xorg/lib/fontconfig/src/Makefile | 10 | ||||
| -rw-r--r-- | external/mit/xorg/server/xorg-server/Makefile | 6 | ||||
| -rw-r--r-- | share/mk/bsd.x11.mk | 3 |
4 files changed, 18 insertions, 5 deletions
diff --git a/external/mit/xorg/include/xcb-proto/Makefile b/external/mit/xorg/include/xcb-proto/Makefile index b80722325b3..75ac833a227 100644 --- a/external/mit/xorg/include/xcb-proto/Makefile +++ b/external/mit/xorg/include/xcb-proto/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2014/03/16 23:25:15 mrg Exp $ +# $NetBSD: Makefile,v 1.4 2014/03/23 20:40:18 mrg Exp $ .include <bsd.own.mk> @@ -14,6 +14,8 @@ FILES= bigreq.xml composite.xml damage.xml dpms.xml dri2.xml dri3.xml \ FILESDIR=${X11SHAREDIR}/xcb PKGCONFIG= xcb-proto +PKGCONFIG_SED_FLAGS= \ + -e "s,@pythondir@,," NOPROG= # defined diff --git a/external/mit/xorg/lib/fontconfig/src/Makefile b/external/mit/xorg/lib/fontconfig/src/Makefile index 736389a7973..c349bcecbea 100644 --- a/external/mit/xorg/lib/fontconfig/src/Makefile +++ b/external/mit/xorg/lib/fontconfig/src/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2013/06/27 12:44:58 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2014/03/23 20:40:18 mrg Exp $ .include <bsd.own.mk> @@ -95,8 +95,9 @@ LIBDPLIBS=\ freetype ${.CURDIR}/../../freetype # XXX FONTCONFIG_PATH was arbitrarily chosen +FONTCONFIG_PATH=/etc/fonts CPPFLAGS+= -DHAVE_CONFIG_H -CPPFLAGS+= -DFONTCONFIG_PATH='"/etc/fonts"' \ +CPPFLAGS+= -DFONTCONFIG_PATH='"${FONTCONFIG_PATH}"' \ -DFC_DEFAULT_FONTS='"${X11FONTDIR}"' \ -DFC_CACHEDIR='"/var/cache/fontconfig"' \ -DHAVE_FT_BITMAP_SIZE_Y_PPEM \ @@ -121,6 +122,11 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/freetype2 \ CLEANFILES+= fcarch.h PKGCONFIG= fontconfig +PKGCONFIG_SED_FLAGS= \ + -e "s,@sysconfdir@,${X11ETCDIR},; \ + s,@localstatedir@,/var,; \ + s,@baseconfigdir@,/etc/fonts,; \ + s,@fc_cachedir@,${FONTCONFIG_PATH}," # XXX CPPFLAGS.fcxml.c= -Wno-error diff --git a/external/mit/xorg/server/xorg-server/Makefile b/external/mit/xorg/server/xorg-server/Makefile index cab1f802e89..a87cc93339f 100644 --- a/external/mit/xorg/server/xorg-server/Makefile +++ b/external/mit/xorg/server/xorg-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2013/06/12 21:35:29 mrg Exp $ +# $NetBSD: Makefile,v 1.21 2014/03/23 20:40:18 mrg Exp $ .include <bsd.own.mk> @@ -20,6 +20,10 @@ SUBDIR+= hw .PATH: ${X11SRCDIR.xorg-server} PKGCONFIG= xorg-server +# Use -fvisibility=hidden for symbol_visibility? +PKGCONFIG_SED_FLAGS= \ + -e "s,@sysconfigdir@,${X11ETCDIR},; \ + s,@symbol_visibility@,," .include <bsd.x11.mk> .include <bsd.man.mk> diff --git a/share/mk/bsd.x11.mk b/share/mk/bsd.x11.mk index fed7b62a86c..599c0b20215 100644 --- a/share/mk/bsd.x11.mk +++ b/share/mk/bsd.x11.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.x11.mk,v 1.110 2014/03/23 19:49:52 tron Exp $ +# $NetBSD: bsd.x11.mk,v 1.111 2014/03/23 20:40:18 mrg Exp $ .include <bsd.init.mk> @@ -272,6 +272,7 @@ ${_pkg}.pc: ${PKGDIST.${_pkg}}/configure ${PKGDIST.${.PREFIX}}/configure); \ fi; \ ${TOOL_SED} \ + ${PKGCONFIG_SED_FLAGS} \ -e "s,@prefix@,${X11ROOTDIR},; \ s,@INSTALL_DIR@,${X11ROOTDIR},; \ s,@exec_prefix@,\\$$\{prefix\},; \ |
