From owner-svn-ports-all@FreeBSD.ORG Tue Jun 24 22:50:36 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A3641DF5; Tue, 24 Jun 2014 22:50:36 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 84F9C2905; Tue, 24 Jun 2014 22:50:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5OMoa3b099197; Tue, 24 Jun 2014 22:50:36 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5OMoa1T099196; Tue, 24 Jun 2014 22:50:36 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201406242250.s5OMoa1T099196@svn.freebsd.org> From: Baptiste Daroussin Date: Tue, 24 Jun 2014 22:50:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r359169 - head/devel/gcc-arm-embedded/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Jun 2014 22:50:36 -0000 Author: bapt Date: Tue Jun 24 22:50:35 2014 New Revision: 359169 URL: http://svnweb.freebsd.org/changeset/ports/359169 QAT: https://qat.redports.org/buildarchive/r359169/ Log: Use MAKE_CMD Modified: head/devel/gcc-arm-embedded/files/Makefile Modified: head/devel/gcc-arm-embedded/files/Makefile ============================================================================== --- head/devel/gcc-arm-embedded/files/Makefile Tue Jun 24 22:50:09 2014 (r359168) +++ head/devel/gcc-arm-embedded/files/Makefile Tue Jun 24 22:50:35 2014 (r359169) @@ -52,23 +52,23 @@ build-binutils: --with-sysroot=${INTERIM_PREFIX}/${TARGET} \ --with-pkgversion="${PKGVERSION}" >> ${WRKDIR}/binutils.log 2>&1 @${ECHO_MSG} "=====> Build" - @${MAKE_ENV} ${GMAKE} -j${MAKE_JOBS_NUMBER} -C ${BUILD_PREFIX}/binutils all >> ${WRKDIR}/binutils.log 2>&1 + @${MAKE_ENV} ${MAKE_CMD} -j${MAKE_JOBS_NUMBER} -C ${BUILD_PREFIX}/binutils all >> ${WRKDIR}/binutils.log 2>&1 @${ECHO_MSG} "=====> Install into stage directory" - @${MAKE_ENV} ${GMAKE} -C ${BUILD_PREFIX}/binutils install >> ${WRKDIR}/binutils.log 2>&1 + @${MAKE_ENV} ${MAKE_CMD} -C ${BUILD_PREFIX}/binutils install >> ${WRKDIR}/binutils.log 2>&1 @${ECHO_MSG} "=====> Prepare working area for library builds" @${MKDIR} ${BUILD_PREFIX}/target-libs >> ${WRKDIR}/binutils.log 2>&1 @${TAR} -cf - -C ${INTERIM_PREFIX} . | ${TAR} -xf - -C ${BUILD_PREFIX}/target-libs >> ${WRKDIR}/binutils.log 2>&1 .if ${PORT_OPTIONS:MHTML} && ${PORT_OPTIONS:MDOCS} @${ECHO_MSG} "=====> Build HTML documentation" - @${MAKE_ENV} ${GMAKE} -C ${BUILD_PREFIX}/binutils html >> ${WRKDIR}/binutils.log 2>&1 + @${MAKE_ENV} ${MAKE_CMD} -C ${BUILD_PREFIX}/binutils html >> ${WRKDIR}/binutils.log 2>&1 @${ECHO_MSG} "=====> Install HTML documentation into stage directory" - @${MAKE_ENV} ${GMAKE} -C ${BUILD_PREFIX}/binutils install-html >> ${WRKDIR}/binutils.log 2>&1 + @${MAKE_ENV} ${MAKE_CMD} -C ${BUILD_PREFIX}/binutils install-html >> ${WRKDIR}/binutils.log 2>&1 .endif .if ${PORT_OPTIONS:MPDF} && ${PORT_OPTIONS:MDOCS} @${ECHO_MSG} "=====> Build PDF documentation" - @${MAKE_ENV} ${GMAKE} -C ${BUILD_PREFIX}/binutils pdf >> ${WRKDIR}/binutils.log 2>&1 + @${MAKE_ENV} ${MAKE_CMD} -C ${BUILD_PREFIX}/binutils pdf >> ${WRKDIR}/binutils.log 2>&1 @${ECHO_MSG} "=====> Install PDF documentation into stage directory" - @${MAKE_ENV} ${GMAKE} -C ${BUILD_PREFIX}/binutils install-pdf >> ${WRKDIR}/binutils.log 2>&1 + @${MAKE_ENV} ${MAKE_CMD} -C ${BUILD_PREFIX}/binutils install-pdf >> ${WRKDIR}/binutils.log 2>&1 .endif @${ECHO_MSG} "=====> Cleanup installation" @${RM} -rf ${INTERIM_PREFIX}/lib >> ${WRKDIR}/binutils.log 2>&1 @@ -115,9 +115,9 @@ build-gcc-first: --with-multilib-list=${MULTILIB_LIST} \ --with-pkgversion="${PKGVERSION}" >> ${WRKDIR}/gcc-first.log 2>&1 @${ECHO_MSG} "=====> Build" - @${MAKE_ENV} ${GMAKE} -j${MAKE_JOBS_NUMBER} -C ${BUILD_PREFIX}/gcc-first all >> ${WRKDIR}/gcc-first.log 2>&1 + @${MAKE_ENV} ${MAKE_CMD} -j${MAKE_JOBS_NUMBER} -C ${BUILD_PREFIX}/gcc-first all >> ${WRKDIR}/gcc-first.log 2>&1 @${ECHO_MSG} "=====> Install into stage directory" - @${MAKE_ENV} ${GMAKE} -C ${BUILD_PREFIX}/gcc-first install-gcc >> ${WRKDIR}/gcc-first.log 2>&1 + @${MAKE_ENV} ${MAKE_CMD} -C ${BUILD_PREFIX}/gcc-first install-gcc >> ${WRKDIR}/gcc-first.log 2>&1 @${RM} -f ${INTERIM_PREFIX}/bin/${TARGET}-gccbug >> ${WRKDIR}/gcc-first.log 2>&1 @${RM} -f ${INTERIM_PREFIX}/lib/libiberty.a >> ${WRKDIR}/gcc-first.log 2>&1 @${RM} -rf ${INTERIM_PREFIX}/include >> ${WRKDIR}/gcc-first.log 2>&1 @@ -141,12 +141,12 @@ build-newlib: --disable-newlib-supplied-syscalls \ --disable-nls >> ${WRKDIR}/newlib.log 2>&1 @${ECHO_MSG} "=====> Build" - @${MAKE_ENV} PATH="${INTERIM_PREFIX}/bin:${PATH}" ${GMAKE} -j${MAKE_JOBS_NUMBER} -C ${BUILD_PREFIX}/newlib all >> ${WRKDIR}/newlib.log 2>&1 + @${MAKE_ENV} PATH="${INTERIM_PREFIX}/bin:${PATH}" ${MAKE_CMD} -j${MAKE_JOBS_NUMBER} -C ${BUILD_PREFIX}/newlib all >> ${WRKDIR}/newlib.log 2>&1 @${ECHO_MSG} "=====> Install into stage directory" - @${MAKE_ENV} PATH="${INTERIM_PREFIX}/bin:${PATH}" ${GMAKE} -C ${BUILD_PREFIX}/newlib install >> ${WRKDIR}/newlib.log 2>&1 + @${MAKE_ENV} PATH="${INTERIM_PREFIX}/bin:${PATH}" ${MAKE_CMD} -C ${BUILD_PREFIX}/newlib install >> ${WRKDIR}/newlib.log 2>&1 .if ${PORT_OPTIONS:MHTML} && ${PORT_OPTIONS:MDOCS} @${ECHO_MSG} "=====> Build HTML documentation" - @${MAKE_ENV} ${GMAKE} -C ${BUILD_PREFIX}/newlib html >> ${WRKDIR}/newlib.log 2>&1 + @${MAKE_ENV} ${MAKE_CMD} -C ${BUILD_PREFIX}/newlib html >> ${WRKDIR}/newlib.log 2>&1 @${ECHO_MSG} "=====> Install HTML documentation into stage directory" @${MKDIR} ${DOC_PREFIX}/html/libc >> ${WRKDIR}/newlib.log 2>&1 @${TAR} -cf - -C ${BUILD_PREFIX}/newlib/${TARGET}/newlib/libc/libc.html . | ${TAR} -xf - -C ${DOC_PREFIX}/html/libc >> ${WRKDIR}/newlib.log 2>&1 @@ -155,8 +155,8 @@ build-newlib: .endif .if ${PORT_OPTIONS:MPDF} && ${PORT_OPTIONS:MDOCS} @${ECHO_MSG} "=====> Build PDF documentation (ignore errors)" - @-${MAKE_ENV} ${GMAKE} -C ${BUILD_PREFIX}/newlib/${TARGET}/newlib/libc pdf >> ${WRKDIR}/newlib.log 2>&1 - @-${MAKE_ENV} ${GMAKE} -C ${BUILD_PREFIX}/newlib/${TARGET}/newlib/libm pdf >> ${WRKDIR}/newlib.log 2>&1 + @-${MAKE_ENV} ${MAKE_CMD} -C ${BUILD_PREFIX}/newlib/${TARGET}/newlib/libc pdf >> ${WRKDIR}/newlib.log 2>&1 + @-${MAKE_ENV} ${MAKE_CMD} -C ${BUILD_PREFIX}/newlib/${TARGET}/newlib/libm pdf >> ${WRKDIR}/newlib.log 2>&1 @${ECHO_MSG} "=====> Install PDF documentation into stage directory" @${CP} -f ${BUILD_PREFIX}/newlib/${TARGET}/newlib/libc/libc.pdf ${DOC_PREFIX}/pdf/libc.pdf >> ${WRKDIR}/newlib.log 2>&1 @${CP} -f ${BUILD_PREFIX}/newlib/${TARGET}/newlib/libm/libm.pdf ${DOC_PREFIX}/pdf/libm.pdf >> ${WRKDIR}/newlib.log 2>&1 @@ -187,9 +187,9 @@ build-newlib-nano: --enable-newlib-global-atexit \ --disable-nls >> ${WRKDIR}/newlib-nano.log 2>&1 @${ECHO_MSG} "=====> Build" - @${MAKE_ENV} PATH="${INTERIM_PREFIX}/bin:${PATH}" ${GMAKE} -j${MAKE_JOBS_NUMBER} -C ${BUILD_PREFIX}/newlib-nano all >> ${WRKDIR}/newlib-nano.log 2>&1 + @${MAKE_ENV} PATH="${INTERIM_PREFIX}/bin:${PATH}" ${MAKE_CMD} -j${MAKE_JOBS_NUMBER} -C ${BUILD_PREFIX}/newlib-nano all >> ${WRKDIR}/newlib-nano.log 2>&1 @${ECHO_MSG} "=====> Install into intermediate directory" - @${MAKE_ENV} PATH="${INTERIM_PREFIX}/bin:${PATH}" ${GMAKE} -C ${BUILD_PREFIX}/newlib-nano install >> ${WRKDIR}/newlib-nano.log 2>&1 + @${MAKE_ENV} PATH="${INTERIM_PREFIX}/bin:${PATH}" ${MAKE_CMD} -C ${BUILD_PREFIX}/newlib-nano install >> ${WRKDIR}/newlib-nano.log 2>&1 build-gcc-final: @${ECHO_MSG} "====> Build final gcc and g++ (log file: ${WRKDIR}/gcc-final.log)" @@ -236,20 +236,20 @@ build-gcc-final: --with-multilib-list=${MULTILIB_LIST} \ --with-pkgversion="${PKGVERSION}" >> ${WRKDIR}/gcc-final.log 2>&1 @${ECHO_MSG} "=====> Build" - @${MAKE_ENV} ${GMAKE} -j${MAKE_JOBS_NUMBER} -C ${BUILD_PREFIX}/gcc-final INHIBIT_LIBC_CFLAGS="-DUSE_TM_CLONE_REGISTRY=0" all >> ${WRKDIR}/gcc-final.log 2>&1 + @${MAKE_ENV} ${MAKE_CMD} -j${MAKE_JOBS_NUMBER} -C ${BUILD_PREFIX}/gcc-final INHIBIT_LIBC_CFLAGS="-DUSE_TM_CLONE_REGISTRY=0" all >> ${WRKDIR}/gcc-final.log 2>&1 @${ECHO_MSG} "=====> Install into stage directory" - @${MAKE_ENV} ${GMAKE} -C ${BUILD_PREFIX}/gcc-final install >> ${WRKDIR}/gcc-final.log 2>&1 + @${MAKE_ENV} ${MAKE_CMD} -C ${BUILD_PREFIX}/gcc-final install >> ${WRKDIR}/gcc-final.log 2>&1 .if ${PORT_OPTIONS:MHTML} && ${PORT_OPTIONS:MDOCS} @${ECHO_MSG} "=====> Build HTML documentation" - @${MAKE_ENV} ${GMAKE} -C ${BUILD_PREFIX}/gcc-final html >> ${WRKDIR}/gcc-final.log 2>&1 + @${MAKE_ENV} ${MAKE_CMD} -C ${BUILD_PREFIX}/gcc-final html >> ${WRKDIR}/gcc-final.log 2>&1 @${ECHO_MSG} "=====> Install HTML documentation into stage directory" - @${MAKE_ENV} ${GMAKE} -C ${BUILD_PREFIX}/gcc-final install-html >> ${WRKDIR}/gcc-final.log 2>&1 + @${MAKE_ENV} ${MAKE_CMD} -C ${BUILD_PREFIX}/gcc-final install-html >> ${WRKDIR}/gcc-final.log 2>&1 .endif .if ${PORT_OPTIONS:MPDF} && ${PORT_OPTIONS:MDOCS} @${ECHO_MSG} "=====> Build PDF documentation" - @${MAKE_ENV} ${GMAKE} -C ${BUILD_PREFIX}/gcc-final pdf >> ${WRKDIR}/gcc-final.log 2>&1 + @${MAKE_ENV} ${MAKE_CMD} -C ${BUILD_PREFIX}/gcc-final pdf >> ${WRKDIR}/gcc-final.log 2>&1 @${ECHO_MSG} "=====> Install PDF documentation into stage directory" - @${MAKE_ENV} ${GMAKE} -C ${BUILD_PREFIX}/gcc-final install-pdf >> ${WRKDIR}/gcc-final.log 2>&1 + @${MAKE_ENV} ${MAKE_CMD} -C ${BUILD_PREFIX}/gcc-final install-pdf >> ${WRKDIR}/gcc-final.log 2>&1 .endif @${ECHO_MSG} "=====> Cleanup installation" @${RM} -f ${INTERIM_PREFIX}/bin/${TARGET}-gccbug >> ${WRKDIR}/gcc-final.log 2>&1 @@ -315,10 +315,10 @@ build-libstdcxx: --with-multilib-list=${MULTILIB_LIST} \ --with-pkgversion="${PKGVERSION}" >> ${WRKDIR}/gcc-size-libstdcxx.log 2>&1 @${ECHO_MSG} "=====> Build" - @${MAKE_ENV} ${GMAKE} -j${MAKE_JOBS_NUMBER} -C ${BUILD_PREFIX}/gcc-size-libstdcxx \ + @${MAKE_ENV} ${MAKE_CMD} -j${MAKE_JOBS_NUMBER} -C ${BUILD_PREFIX}/gcc-size-libstdcxx \ CXXFLAGS_FOR_TARGET="-g -Os -ffunction-sections -fdata-sections -fno-exceptions" all >> ${WRKDIR}/gcc-size-libstdcxx.log 2>&1 @${ECHO_MSG} "=====> Install into intermediate directory" - @${MAKE_ENV} ${GMAKE} -C ${BUILD_PREFIX}/gcc-size-libstdcxx install >> ${WRKDIR}/gcc-size-libstdcxx.log 2>&1 + @${MAKE_ENV} ${MAKE_CMD} -C ${BUILD_PREFIX}/gcc-size-libstdcxx install >> ${WRKDIR}/gcc-size-libstdcxx.log 2>&1 @${ECHO_MSG} "=====> Copy all target libraries into stage directory" @for multilib in $$(${BUILD_PREFIX}/target-libs/bin/${TARGET}-gcc -print-multi-lib) ; do \ multilib_dir=$${multilib%%;*} ; \ @@ -352,21 +352,21 @@ build-gdb: --with-gdb-datadir='$${prefix}/${TARGET}/share/gdb' \ --with-pkgversion="${PKGVERSION}" >> ${WRKDIR}/gdb.log 2>&1 @${ECHO_MSG} "=====> Build" - @${MAKE_ENV} ${GMAKE} -j${MAKE_JOBS_NUMBER} -C ${BUILD_PREFIX}/gdb all >> ${WRKDIR}/gdb.log 2>&1 + @${MAKE_ENV} ${MAKE_CMD} -j${MAKE_JOBS_NUMBER} -C ${BUILD_PREFIX}/gdb all >> ${WRKDIR}/gdb.log 2>&1 @${ECHO_MSG} "=====> Install into stage directory" - @${MAKE_ENV} ${GMAKE} -C ${BUILD_PREFIX}/gdb install >> ${WRKDIR}/gdb.log 2>&1 + @${MAKE_ENV} ${MAKE_CMD} -C ${BUILD_PREFIX}/gdb install >> ${WRKDIR}/gdb.log 2>&1 @${RM} -rf ${INTERIM_PREFIX}/include .if ${PORT_OPTIONS:MHTML} && ${PORT_OPTIONS:MDOCS} @${ECHO_MSG} "=====> Build HTML documentation" - @${MAKE_ENV} ${GMAKE} -C ${BUILD_PREFIX}/gdb html >> ${WRKDIR}/gdb.log 2>&1 + @${MAKE_ENV} ${MAKE_CMD} -C ${BUILD_PREFIX}/gdb html >> ${WRKDIR}/gdb.log 2>&1 @${ECHO_MSG} "=====> Install HTML documentation into stage directory" - @${MAKE_ENV} ${GMAKE} -C ${BUILD_PREFIX}/gdb install-html >> ${WRKDIR}/gdb.log 2>&1 + @${MAKE_ENV} ${MAKE_CMD} -C ${BUILD_PREFIX}/gdb install-html >> ${WRKDIR}/gdb.log 2>&1 .endif .if ${PORT_OPTIONS:MPDF} && ${PORT_OPTIONS:MDOCS} @${ECHO_MSG} "=====> Build PDF documentation" - @${MAKE_ENV} ${GMAKE} -C ${BUILD_PREFIX}/gdb pdf >> ${WRKDIR}/gdb.log 2>&1 + @${MAKE_ENV} ${MAKE_CMD} -C ${BUILD_PREFIX}/gdb pdf >> ${WRKDIR}/gdb.log 2>&1 @${ECHO_MSG} "=====> Install PDF documentation into stage directory" - @${MAKE_ENV} ${GMAKE} -C ${BUILD_PREFIX}/gdb install-pdf >> ${WRKDIR}/gdb.log 2>&1 + @${MAKE_ENV} ${MAKE_CMD} -C ${BUILD_PREFIX}/gdb install-pdf >> ${WRKDIR}/gdb.log 2>&1 .endif install-samples: