ports/166373: [x11] x11/libX11 fails if /usr/bin/cpp is clang

[Jan Beich]

The following reply was made to PR ports/166373; it has been noted by GNATS.

From: Jan Beich <jbeich at tormail.org>
To: Jakub Lach <jakub_lach at mailplus.pl>
Cc: bug-followup at FreeBSD.org
Subject: Re: ports/166373: [x11] x11/libX11 fails if /usr/bin/cpp is clang
Date: Tue, 01 May 2012 08:47:26 +0300

 --=-=-=
 Content-Type: text/plain
 
 Here's a template fix. Xserver likely needs similar patch.
 
   # if you already have lang/gcc installed
   $ echo RAWCPP=/usr/local/bin/cpp46 >>Makefile.local
   $ make install
   
 
 --=-=-=
 Content-Type: text/x-patch
 Content-Disposition: attachment; filename=clang.diff
 
 Index: x11/libX11/Makefile
 ===================================================================
 RCS file: /a/.csup/ports/x11/libX11/Makefile,v
 retrieving revision 1.40
 diff -u -p -r1.40 Makefile
 --- x11/libX11/Makefile	9 Nov 2011 15:25:48 -0000	1.40
 +++ x11/libX11/Makefile	1 May 2012 05:32:03 -0000
 @@ -25,12 +25,21 @@ USE_XORG=	bigreqsproto xau xcmiscproto x
  CONFIGURE_ARGS+=	--datadir=${PREFIX}/lib \
  			--without-xmlto \
  			--disable-specs
 -CONFIGURE_ENV+=	ac_cv_path_PS2PDF=""
 +CONFIGURE_ENV+=	RAWCPP="${RAWCPP}" ac_cv_path_PS2PDF=""
  
  .include "${.CURDIR}/manpages"
  
 +.include <bsd.port.pre.mk>
 +
 +.if ${CPP:Mclang*}
 +RAWCPP?=	${LOCALBASE}/bin/ucpp
 +BUILD_DEPENDS+=	${RAWCPP}:${PORTSDIR}/devel/ucpp
 +.else
 +RAWCPP?=	$$(command -v ${CPP})
 +.endif
 +
  post-patch:
  	@${REINPLACE_CMD} '/^install-data-am:/,/^$$/ \
  		s/install-specDATA//' ${WRKSRC}/nls/Makefile.in
  
 -.include <bsd.port.mk>
 +.include <bsd.port.post.mk>
 
 --=-=-=--