Date: Mon, 27 Jan 2014 20:47:59 +0100 From: Juergen Lock <nox@jelal.kn-bremen.de> To: Baptiste Daroussin <bapt@FreeBSD.org> Cc: svn-ports-head@FreeBSD.org, svn-ports-all@FreeBSD.org, ports-committers@FreeBSD.org Subject: Re: svn commit: r341335 - in head/Mk: . Uses Message-ID: <20140127194758.GA52410@enceladus10.kn-bremen.de> In-Reply-To: <201401270814.s0R8EUej095720@svn.freebsd.org> References: <201401270814.s0R8EUej095720@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Mon, Jan 27, 2014 at 08:14:30AM +0000, Baptiste Daroussin wrote: > Author: bapt > Date: Mon Jan 27 08:14:30 2014 > New Revision: 341335 > URL: http://svnweb.freebsd.org/changeset/ports/341335 > QAT: https://qat.redports.org/buildarchive/r341335/ > > Log: > Do not pass DESTDIR to build target (with a syntax compatible with both fmake and bmake) > That fixes a couple of STAGEDIR references in the install files > This breaks at least NO_STAGE ports that pass make vars via MAKE_ARGS on 9: All "FOO=bar" are passed as "FOO" i.e. w/o the value, causing (g)make to complain about undefined targets. (Can also be seen via "make -n do-install".) :/, Juergen > Modified: > head/Mk/Uses/desthack.mk > head/Mk/bsd.port.mk > > Modified: head/Mk/Uses/desthack.mk > ============================================================================== > --- head/Mk/Uses/desthack.mk Mon Jan 27 07:32:02 2014 (r341334) > +++ head/Mk/Uses/desthack.mk Mon Jan 27 08:14:30 2014 (r341335) > @@ -14,16 +14,9 @@ > _INCLUDE_USES_DESTHACK_MK= yes > > .if defined(_desthack_ARGS) > -IGNORE= USES=desthack does not require args > +IGNORE= USES=desthack valide args are none or 'la' > .endif > > -_USES_POST= desthack > GNU_CONFIGURE_PREFIX= \$${${DESTDIRNAME}}${PREFIX} > GNU_CONFIGURE_MANPREFIX= \$${${DESTDIRNAME}}${MANPREFIX} > .endif > - > -.if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_DESTHACK_POST_MK) > -_INCLUDE_USES_DESTHACK_POST_MK= yes > -post-stage: > - @${SED} -i '' -e 's,${STAGEDIR},,g' ${STAGEDIR}${PREFIX}/lib/*.la > -.endif > > Modified: head/Mk/bsd.port.mk > ============================================================================== > --- head/Mk/bsd.port.mk Mon Jan 27 07:32:02 2014 (r341334) > +++ head/Mk/bsd.port.mk Mon Jan 27 08:14:30 2014 (r341335) > @@ -3625,10 +3625,10 @@ do-configure: > .endif > > # Build > - > +# XXX: ${MAKE_ARGS:N${DESTDIRNAME}=*} would be easier but it is not valid with the old fmake > .if !target(do-build) > do-build: > - @(cd ${BUILD_WRKSRC}; if ! ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET}; then \ > + @(cd ${BUILD_WRKSRC}; if ! ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS:C,${DESTDIRNAME}=.*,,g} ${ALL_TARGET}; then \ > if [ -n "${BUILD_FAIL_MESSAGE}" ] ; then \ > ${ECHO_MSG} "===> Compilation failed unexpectedly."; \ > (${ECHO_CMD} "${BUILD_FAIL_MESSAGE}") | ${FMT} 75 79 ; \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140127194758.GA52410>