diff options
author | zeising <zeising@058c260c-8361-11dd-a0ac-aa2bafec7d09> | 2012-05-27 23:22:10 +0800 |
---|---|---|
committer | zeising <zeising@058c260c-8361-11dd-a0ac-aa2bafec7d09> | 2012-05-27 23:22:10 +0800 |
commit | b825a89e5d9b8487c4ad1569a1c1dd6cc9c2bce7 (patch) | |
tree | f563a2c179309c609a7fc5173e1cf2191e482106 /x11 | |
parent | 5327294de4d4ec2586460026b825e676b3d623f4 (diff) | |
download | xorg-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')
-rw-r--r-- | x11/libX11/Makefile | 5 | ||||
-rw-r--r-- | x11/xinit/Makefile | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile index 4cf7834..4970e9b 100644 --- a/x11/libX11/Makefile +++ b/x11/libX11/Makefile @@ -15,7 +15,8 @@ COMMENT= X11 library LICENSE= MIT -BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/xcb.pc:${PORTSDIR}/x11/libxcb \ +BUILD_DEPENDS+= ucpp:${PORTSDIR}/devel/ucpp \ + ${LOCALBASE}/libdata/pkgconfig/xcb.pc:${PORTSDIR}/x11/libxcb \ ${LOCALBASE}/share/aclocal/xorg-macros.m4:${PORTSDIR}/devel/xorg-macros RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/xcb.pc:${PORTSDIR}/x11/libxcb @@ -25,7 +26,7 @@ USE_XORG= bigreqsproto xau xcmiscproto xdmcp xextproto xtrans \ CONFIGURE_ARGS+= --datadir=${PREFIX}/lib \ --without-xmlto \ --disable-specs -CONFIGURE_ENV+= ac_cv_path_PS2PDF="" +CONFIGURE_ENV+= RAWCPP="${LOCALBASE}/bin/ucpp ac_cv_path_PS2PDF="" .include "${.CURDIR}/manpages" diff --git a/x11/xinit/Makefile b/x11/xinit/Makefile index 3bf4fc4..46589d4 100644 --- a/x11/xinit/Makefile +++ b/x11/xinit/Makefile @@ -15,8 +15,10 @@ COMMENT= X Window System initializer LICENSE= MIT +BUILD_DEPENDS= ucpp:${PORTSDIR}/devel/ucpp XORG_CAT= app USE_XORG= x11 +CONFIGURE_ENV+= RAWCPP="${LOCALBASE}/bin/ucpp" PLIST_FILES= bin/startx bin/xinit lib/X11/xinit/xinitrc PLIST_DIRS= lib/X11/xinit |