Date: Thu, 3 Apr 2014 13:35:51 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r350010 - head/Mk Message-ID: <201404031335.s33DZp5v096309@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Thu Apr 3 13:35:51 2014 New Revision: 350010 URL: http://svnweb.freebsd.org/changeset/ports/350010 QAT: https://qat.redports.org/buildarchive/r350010/ Log: Add PKG_ENV to allow specifying the file to read the ABI from in case of cross building Add STRIPBIN set the the cross building version of strip in MAKE_ENV so install(1) use the proper one in case of cross building Modified: head/Mk/bsd.pkgng.mk head/Mk/bsd.port.mk Modified: head/Mk/bsd.pkgng.mk ============================================================================== --- head/Mk/bsd.pkgng.mk Thu Apr 3 13:33:37 2014 (r350009) +++ head/Mk/bsd.pkgng.mk Thu Apr 3 13:35:51 2014 (r350010) @@ -247,7 +247,7 @@ do-package: ${TMPPLIST} ${RM} -f ${PACKAGES}/$$cat/${PKGNAMEPREFIX}${PORTNAME}*${PKG_SUFX} ; \ done @${MKDIR} ${WRKDIR}/pkg - @if ${SETENV} FORCE_POST="${_FORCE_POST_PATTERNS}" ${PKG_CREATE} ${PKG_CREATE_ARGS} -o ${WRKDIR}/pkg ${PKGNAME}; then \ + @if ${SETENV} ${PKG_ENV} FORCE_POST="${_FORCE_POST_PATTERNS}" ${PKG_CREATE} ${PKG_CREATE_ARGS} -o ${WRKDIR}/pkg ${PKGNAME}; then \ if [ -d ${PKGREPOSITORY} -a -w ${PKGREPOSITORY} ]; then \ ${LN} -f ${WRKDIR}/pkg/${PKGNAME}${PKG_SUFX} ${PKGFILE} 2>/dev/null \ || ${CP} -af ${WRKDIR}/pkg/${PKGNAME}${PKG_SUFX} ${PKGFILE}; \ Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Thu Apr 3 13:33:37 2014 (r350009) +++ head/Mk/bsd.port.mk Thu Apr 3 13:35:51 2014 (r350010) @@ -1145,7 +1145,8 @@ CFLAGS+= -B${LOCALBASE}/${X_BUILD_FOR}/u CXXFLAGS+= -B${LOCALBASE}/${X_BUILD_FOR}/usr/bin LDFLAGS+= -B${LOCALBASE}/${X_BUILD_FOR}/usr/bin CONFIGURE_ENV+= LD=${LD} AS=${AS} NM=${NM} -MAKE_ENV+= LD=${LD} AS=${AS} NM=${NM} +MAKE_ENV+= LD=${LD} AS=${AS} NM=${NM} STRIPBIN=${X_BUILD_FOR}-strip +PKG_ENV+= ABI_FILE=${LOCALBASE}/${X_BUILD_FOR}/usr/lib/crt1.o .endif #
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404031335.s33DZp5v096309>