1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-24 00:45:52 +00:00

Fix the build of xorg related ports when the base system is compiled with

clang as system compiler and cpp is clang cpp (as opposed to GNU cpp).
This is done by removing the configure test for cpp completely.  Using
clang cpp will make some manual pages as well as some scripts get slightly
wierd whitespace formatting.  However, it does not affect the function of
the scripts or the instructions in the manual pages.

PR:             ports/166373
Submitted by:   Jakub Lach <jakub_lach@mailplus.pl> (PR)
Patch by:       me (with ideas from PR and mailing list)
Tested by:      Jakub Lach <jakub_lach@mailplus.pl>, me
Approved by:    kwm (mentor)
Obtained from:  xorg staging area
This commit is contained in:
Niclas Zeising 2012-07-29 18:26:00 +00:00
parent 228cdb0c0b
commit 7761aefad2
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=301687
5 changed files with 16 additions and 0 deletions

View File

@ -20,4 +20,8 @@ XORG_CAT= driver
USE_XORG= xf86dgaproto xf86driproto xineramaproto videoproto xf86miscproto xextproto glproto
MAN4= sis.4x
post-patch:
@${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' \
${WRKSRC}/configure
.include <bsd.port.mk>

View File

@ -148,6 +148,10 @@ pre-everything::
@${ECHO_MSG} "xorg-server_UNSET=SUID in /etc/make.conf."
.endif
post-patch:
@${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' \
${WRKSRC}/configure
.if defined(WITH_NEW_XORG)
post-install:
@${MKDIR} ${PREFIX}/share/X11/xorg.conf.d

View File

@ -285,4 +285,8 @@ MAN3= MenuPopdown.3 \
XtWindowOfObject.3 \
XtWindowToWidget.3
post-patch:
@${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' \
${WRKSRC}/configure
.include <bsd.port.mk>

View File

@ -22,6 +22,7 @@ RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/xcb.pc:${PORTSDIR}/x11/libxcb
XORG_CAT= lib
USE_XORG= bigreqsproto xau xcmiscproto xdmcp xextproto xtrans \
kbproto:both inputproto xf86bigfontproto xproto:both
CONFIGURE_ARGS+= --datadir=${PREFIX}/lib \
--without-xmlto \
--disable-specs
@ -30,6 +31,8 @@ CONFIGURE_ENV+= ac_cv_path_PS2PDF=""
.include "${.CURDIR}/manpages"
post-patch:
@${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' \
${WRKSRC}/configure
@${REINPLACE_CMD} '/^install-data-am:/,/^$$/ \
s/install-specDATA//' ${WRKSRC}/nls/Makefile.in

View File

@ -24,6 +24,7 @@ PLIST_DIRS= lib/X11/xinit
MAN1= startx.1 xinit.1
post-patch:
@${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' ${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|hexdump|/usr/bin/hexdump|' ${WRKSRC}/startx.cpp
@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' ${WRKSRC}/man/xinit.man