Date: Tue, 06 Dec 2011 11:31:41 -0600 From: Jan Beich <jbeich@tormail.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/163094: [patch] www/netsurf: respect CC/_MAKE_JOBS (libs) Message-ID: <1RXyxV-000KKF-VV@internal.tormail.net> Resent-Message-ID: <201112061740.pB6He6F5016277@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 163094
>Category: ports
>Synopsis: [patch] www/netsurf: respect CC/_MAKE_JOBS (libs)
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Tue Dec 06 17:40:06 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Jan Beich
>Release: FreeBSD 10.0-CURRENT amd64
>Organization:
>Environment:
>Description:
- HOST_CC is reset to `cc' when HOST != TARGET for libs
and HOST_CC is `gcc' when building netsurf, override it
- build libs with multiple jobs, too
- make `cd' more verbose by using `-C' from gmake(1) making it easier
to tell in which directory error occured
- allow specifying PREFIX on command line
- properly detect clang when the first word contains system name, e.g.
$ clang --version
FreeBSD clang version 3.0 (branches/release_30 142614) 20111021
Target: x86_64-unknown-freebsd10.0
Thread model: posix
>How-To-Repeat:
http://pointyhat-west.isc.freebsd.org/errorlogs/amd64-errorlogs/e.9-exp-clang.20111205013108.pointyhat-west/netsurf-2.8.log
$ make install PREFIX=/test
>Fix:
--- cc.diff begins here ----
Index: www/netsurf/Makefile
===================================================================
RCS file: /a/.csup/ports/www/netsurf/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- www/netsurf/Makefile 18 Oct 2011 21:09:35 -0000 1.13
+++ www/netsurf/Makefile 6 Dec 2011 17:24:00 -0000
@@ -34,7 +34,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}
USE_GNOME= libglade2 librsvg2 libxml2
USE_GMAKE= yes
MAKE_ENV= PKG_CONFIG_PATH="${WRKDIR}/fakeroot/lib/pkgconfig:${LOCALBASE}/libdata/pkgconfig"
-MAKE_ARGS= CC="${CC}" CCOPT="" TARGET="gtk" HOST="${OPSYS}" \
+MAKE_ARGS= HOST_CC="${CC}" CC="${CC}" CCOPT="" HOST="${OPSYS}" \
WARNFLAGS="${CFLAGS}" Q=""
MAKE_JOBS_SAFE= yes
@@ -50,6 +50,8 @@ post-patch:
's| -O2 | |' ${WRKSRC}/Makefile.defaults
@${REINPLACE_CMD} -e \
's| -g | |' ${WRKSRC}/gtk/Makefile.target
+ @${REINPLACE_CMD} -e '/ifeq.*clang/s/word 1/filter clang/' \
+ ${WRKDIR}/*/build/makefiles/Makefile.tools
do-configure:
@${TOUCH} ${WRKDIR}/${PARSERUTILS_DISTNAME:S/-src//}/Makefile.config.override
@@ -67,8 +69,8 @@ pre-build:
.for dir in ${PARSERUTILS_DISTNAME:S/-src//} ${WAPCAPLET_DISTNAME} \
${HUBBUB_DISTNAME:S/-src//} ${CSS_DISTNAME:S/-src//} \
${NSBMP_DISTNAME} ${NSGIF_DISTNAME}
- @(cd ${WRKDIR}/${dir} && ${SETENV} PREFIX="${WRKDIR}/fakeroot" \
- ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
+ @${MAKE_ENV} ${GMAKE} -C${WRKDIR}/${dir} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} \
+ ${MAKE_ARGS} ${INSTALL_TARGET} PREFIX="${WRKDIR}/fakeroot"
.endfor
do-install:
--- cc.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1RXyxV-000KKF-VV>