Date: Tue, 25 Dec 2012 16:30:05 +0800 From: Kevin Lo <kevlo@FreeBSD.org> To: Jan Beich <jbeich@tormail.org> Cc: svn-ports-head@FreeBSD.org, svn-ports-all@FreeBSD.org, ports-committers@FreeBSD.org, Niclas Zeising <zeising@FreeBSD.org> Subject: Re: svn commit: r309459 - head/devel/gccmakedep Message-ID: <1356424205.2276.0.camel@nsl> In-Reply-To: <1TnLUj-000DWe-DJ@internal.tormail.org> References: <201212241325.qBODPXhN013126@svn.freebsd.org> <1TnLUj-000DWe-DJ@internal.tormail.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Jan Beich wrote: > Niclas Zeising <zeising@FreeBSD.org> writes: > > > Author: zeising > > Date: Mon Dec 24 13:25:33 2012 > > New Revision: 309459 > > URL: http://svnweb.freebsd.org/changeset/ports/309459 > > > > Log: > > Attempt to fix build when clang is used. > > Add depenency on ucpp and use that as cpp when clang is cc. [1] > > While here, trim makefile headers. [2] > > > > Submitted by: kevlo [1], zeising [2] > > Approved by: kwm, miwi (mentors, implicit) > [...] > > -.include <bsd.port.mk> > > +.include <bsd.port.pre.mk> > > + > > +.if defined(CC) && ${CC:T:M*clang*} == "clang" || ${OSVERSION} >= 1000024 > > +BUILD_DEPENDS+= ucpp:${PORTSDIR}/devel/ucpp > > +RUN_DEPENDS+= ucpp:${PORTSDIR}/devel/ucpp > > +CONFIGURE_ENV+= ac_cv_path_RAWCPP="ucpp -s" > > +.endif > > + > > +.include <bsd.port.post.mk> > > Leaving runtime broken? > > $ gccmakedep > cc: error: no input files > /usr/local/bin/gccmakedep: rm -f: not found > usage: ln [-s [-F] | -L | -P] [-f | -i] [-hnv] source_file [target_file] > ln [-s [-F] | -L | -P] [-f | -i] [-hnv] source_file ... target_dir > link source_file target_file > usage: mv [-f | -i | -n] [-hv] source target > mv [-f | -i | -n] [-v] source ... directory > /usr/local/bin/gccmakedep: mdep33211.tmp: not found > > Notice that devel/imake tries to clean up after ucpp: > > ${REINPLACE_CMD} -e 's|^configdirspec= *|configdirspec=|' ${WRKSRC}/xmkmf Here's the diff to fix it. Index: Makefile =================================================================== --- Makefile (revision 309469) +++ Makefile (working copy) @@ -20,6 +20,12 @@ PLIST_FILES= bin/gccmakedep BUILD_DEPENDS+= ucpp:${PORTSDIR}/devel/ucpp RUN_DEPENDS+= ucpp:${PORTSDIR}/devel/ucpp CONFIGURE_ENV+= ac_cv_path_RAWCPP="ucpp -s" + +post-build: + ${REINPLACE_CMD} -e 's|^CC= *|CC=|' \ + -e 's|^RM= *|RM=|' \ + -e 's|^LN= *|LN=|' \ + -e 's|^MV= *|MV=|' ${WRKSRC}/gccmakedep .endif .include <bsd.port.post.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1356424205.2276.0.camel>