svn commit: r309459 - head/devel/gccmakedep
Kevin Lo
kevlo at FreeBSD.org
Tue Dec 25 08:30:09 UTC 2012
Jan Beich wrote:
> Niclas Zeising <zeising at 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>
More information about the svn-ports-all
mailing list