summaryrefslogtreecommitdiffstats
path: root/x11-servers
diff options
context:
space:
mode:
authorzeising <zeising@058c260c-8361-11dd-a0ac-aa2bafec7d09>2012-05-27 23:22:10 +0800
committerzeising <zeising@058c260c-8361-11dd-a0ac-aa2bafec7d09>2012-05-27 23:22:10 +0800
commitb825a89e5d9b8487c4ad1569a1c1dd6cc9c2bce7 (patch)
treef563a2c179309c609a7fc5173e1cf2191e482106 /x11-servers
parent5327294de4d4ec2586460026b825e676b3d623f4 (diff)
downloadxorg-devel-ports-b825a89e5d9b8487c4ad1569a1c1dd6cc9c2bce7.tar
xorg-devel-ports-b825a89e5d9b8487c4ad1569a1c1dd6cc9c2bce7.tar.gz
xorg-devel-ports-b825a89e5d9b8487c4ad1569a1c1dd6cc9c2bce7.tar.bz2
xorg-devel-ports-b825a89e5d9b8487c4ad1569a1c1dd6cc9c2bce7.tar.lz
xorg-devel-ports-b825a89e5d9b8487c4ad1569a1c1dd6cc9c2bce7.tar.xz
xorg-devel-ports-b825a89e5d9b8487c4ad1569a1c1dd6cc9c2bce7.tar.zst
xorg-devel-ports-b825a89e5d9b8487c4ad1569a1c1dd6cc9c2bce7.zip
Add dependency on ucpp for the ports that does not build using clang's cpp.
This is done explicitly regardless of wether cpp is clang or gcc. git-svn-id: https://trillian.chruetertee.ch/svn/ports/trunk@500 058c260c-8361-11dd-a0ac-aa2bafec7d09
Diffstat (limited to 'x11-servers')
-rw-r--r--x11-servers/xorg-server/Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile
index 84216f4..c9af1ba 100644
--- a/x11-servers/xorg-server/Makefile
+++ b/x11-servers/xorg-server/Makefile
@@ -18,7 +18,8 @@ COMMENT?= X.Org X server and related programs
LIB_DEPENDS= drm:${PORTSDIR}/graphics/libdrm
-RUN_DEPENDS= xkeyboard-config>=2.5:${PORTSDIR}/x11/xkeyboard-config \
+RUN_DEPENDS= ucpp:${PORTSDIR}/devel/ucpp \
+ xkeyboard-config>=2.5:${PORTSDIR}/x11/xkeyboard-config \
xkbcomp:${PORTSDIR}/x11/xkbcomp
XORG_CAT= xserver
@@ -55,6 +56,7 @@ CONFIGURE_ARGS?=--disable-dmx --disable-xvfb --disable-xnest \
--without-xmlto --disable-docs --disable-devel-docs \
--localstatedir=/var --without-dtrace --disable-xephyr \
--enable-record=yes
+CONFIGURE_ENV+= RAWCPP="${LOCALBASE}/bin/ucpp"
.if !defined(SLAVE_PORT)
MAN1= Xorg.1 \
@@ -90,7 +92,7 @@ OPTIONS+= HAL "Compile with HAL config support" on
# The reason why I use this is cause openssl from base doesn't install a .pc file
# and configure will fail trying to find it. Setting both of those variables to
# a *non-empty* value by-passes the pkg-config check.
-CONFIGURE_ENV= SHA1_LIB="-L/usr/lib -lcrypto" SHA1_CFLAGS="-I/usr/include"
+CONFIGURE_ENV+= SHA1_LIB="-L/usr/lib -lcrypto" SHA1_CFLAGS="-I/usr/include"
.endif
.if !defined(WITHOUT_HAL)