Date: Wed, 13 Apr 2016 10:41:49 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413189 - in head/devel: arm-none-eabi-gcc492 djgpp-binutils powerpc64-gcc psptoolchain-gcc-stage1 Message-ID: <201604131041.u3DAfnWd001140@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Wed Apr 13 10:41:49 2016 New Revision: 413189 URL: https://svnweb.freebsd.org/changeset/ports/413189 Log: devel/*gcc*: convert to CONFIGURE_OUTSOURCE in trivial cases PR: 208294 Exp-run by: antoine Approved by: portmgr blanket Differential Revision: https://reviews.freebsd.org/D4157 Modified: head/devel/arm-none-eabi-gcc492/Makefile (contents, props changed) head/devel/djgpp-binutils/Makefile (contents, props changed) head/devel/powerpc64-gcc/Makefile (contents, props changed) head/devel/psptoolchain-gcc-stage1/Makefile (contents, props changed) Modified: head/devel/arm-none-eabi-gcc492/Makefile ============================================================================== --- head/devel/arm-none-eabi-gcc492/Makefile Wed Apr 13 10:40:58 2016 (r413188) +++ head/devel/arm-none-eabi-gcc492/Makefile Wed Apr 13 10:41:49 2016 (r413189) @@ -25,13 +25,11 @@ PLIST_SUB= TARGETARCH=${PKGNAMEPREFIX:C/ OPSYS=${OPSYS:tl} \ GCC_TARGET=${GCC_TARGET} -PATCH_WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -WRKSRC= ${WRKDIR}/build-gcc - GCC_TARGET= arm-none-eabi BU_PREFIX?= ${GCC_TARGET} GNU_CONFIGURE= yes +CONFIGURE_OUTSOURCE= yes # libstdcxx won't build, but we don't need it or multiple float-abi libs. CONFIGURE_ARGS= --target=${GCC_TARGET} --disable-nls --enable-languages=c,c++ \ --without-headers \ @@ -43,8 +41,6 @@ CONFIGURE_ARGS= --target=${GCC_TARGET} - --disable-libstdcxx \ --disable-multilib -CONFIGURE_SCRIPT= ../${PORTNAME}-${PORTVERSION}/configure - PLIST= ${.CURDIR}/pkg-plist # U-Boot requires libgcc, crossbuild and install it along with the compiler. @@ -55,9 +51,6 @@ INSTALL_TARGET= install-gcc install-targ CONFIGURE_TARGET= ${ARCH}-portbld-${OPSYS:tl}${OSREL} -post-extract: - @${MKDIR} ${WRKSRC} - post-stage: @if [ -f ${STAGEDIR}${PREFIX}/bin/cpp ] ; then \ ${MV} ${STAGEDIR}${PREFIX}/bin/cpp \ Modified: head/devel/djgpp-binutils/Makefile ============================================================================== --- head/devel/djgpp-binutils/Makefile Wed Apr 13 10:40:58 2016 (r413188) +++ head/devel/djgpp-binutils/Makefile Wed Apr 13 10:41:49 2016 (r413189) @@ -14,13 +14,9 @@ LICENSE= GPLv2 TARGET= i586-pc-msdosdjgpp -PATCH_WRKSRC= ${SRCDIR} -CONFIGURE_SCRIPT= ../${SRCDIR:C/${WRKDIR}//}/configure - USES= gmake makeinfo tar:bzip2 GNU_CONFIGURE= yes -SRCDIR= ${WRKDIR}/binutils-${PORTVERSION} -WRKSRC= ${WRKDIR}/build +CONFIGURE_OUTSOURCE= yes CONFIGURE_ARGS= --target=${TARGET} \ --with-gcc --with-gnu-ld --with-gnu-as \ --disable-nls --disable-shared --disable-werror @@ -31,9 +27,6 @@ INFO_PATH= ${TARGET}/info BINARIES= addr2line ar as c++filt ld nm objcopy objdump ranlib \ readelf size strings strip -pre-configure: - @${MKDIR} ${CONFIGURE_WRKSRC} - post-install: .for F in ${BINARIES} @${LN} -f ${STAGEDIR}${PREFIX}/bin/${TARGET}-$F ${STAGEDIR}${PREFIX}/${TARGET}/bin/$F Modified: head/devel/powerpc64-gcc/Makefile ============================================================================== --- head/devel/powerpc64-gcc/Makefile Wed Apr 13 10:40:58 2016 (r413188) +++ head/devel/powerpc64-gcc/Makefile Wed Apr 13 10:41:49 2016 (r413189) @@ -24,9 +24,6 @@ LIB_DEPENDS= libgmp.so:math/gmp \ BUILD_DEPENDS= ${BU_PREFIX}-as:devel/${PKGNAMEPREFIX}binutils RUN_DEPENDS= ${BU_PREFIX}-as:devel/${PKGNAMEPREFIX}binutils -PATCH_WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -WRKSRC= ${WRKDIR}/build-gcc - .if empty(GCC_TARGET) # We are building for a FreeBSD target GCC_TARGET?= ${PKGNAMEPREFIX}portbld-${OPSYS:tl}${OSREL} @@ -42,6 +39,7 @@ EXTRA_PATCHES+= ${FILESDIR}/freebsd-form CONFIGURE_ENV= LC_ALL=C MAKE_ENV= LC_ALL=C GNU_CONFIGURE= yes +CONFIGURE_OUTSOURCE= yes CONFIGURE_ARGS+=--target=${GCC_TARGET} --disable-nls --enable-languages=c,c++ \ --without-headers \ --with-gmp=${LOCALBASE} \ @@ -50,8 +48,6 @@ CONFIGURE_ARGS+=--target=${GCC_TARGET} - --with-as=${LOCALBASE}/bin/${BU_PREFIX}-as \ --with-ld=${LOCALBASE}/bin/${BU_PREFIX}-ld -CONFIGURE_SCRIPT= ../${PORTNAME}-${PORTVERSION}/configure - ALL_TARGET?= all-gcc INSTALL_TARGET?= install-gcc BROKEN_FreeBSD9= plist is different on 9.x that on other arches @@ -64,9 +60,6 @@ CONFIGURE_TARGET= x86_64-portbld-${OPSYS CONFIGURE_TARGET= ${ARCH}-portbld-${OPSYS:tl}${OSREL} .endif -post-extract: - @${MKDIR} ${WRKSRC} - post-install: @if [ -f ${STAGEDIR}${PREFIX}/bin/cpp ] ; then \ mv ${STAGEDIR}${PREFIX}/bin/cpp \ Modified: head/devel/psptoolchain-gcc-stage1/Makefile ============================================================================== --- head/devel/psptoolchain-gcc-stage1/Makefile Wed Apr 13 10:40:58 2016 (r413188) +++ head/devel/psptoolchain-gcc-stage1/Makefile Wed Apr 13 10:41:49 2016 (r413189) @@ -35,14 +35,10 @@ BUILD_DEPENDS+= psp-addr2line:devel/psp psp-strip:devel/psptoolchain-binutils USES= gmake libtool tar:bzip2 -PATCH_WRKSRC= ${SRCDIR} -CONFIGURE_SCRIPT= ../${SRCDIR:S/${WRKDIR}\///}/configure - -SRCDIR= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -WRKSRC= ${WRKDIR}/build MAKE_ENV+= PATH=${LOCALBASE}/${PSP_GCC_STAGE_PREFIX}/bin:${PREFIX}/bin:${PATH} HAS_CONFIGURE= yes +CONFIGURE_OUTSOURCE= yes CONFIGURE_ARGS?= --prefix=${PREFIX}/${PSP_GCC_STAGE_PREFIX} \ --target="psp" \ --enable-languages="c" \ @@ -57,22 +53,19 @@ CONFIGURE_ARGS?= --prefix=${PREFIX}/${PS --with-as=${LOCALBASE}/bin/psp-as \ --mandir=${PREFIX}/man -pre-configure: - @${MKDIR} ${CONFIGURE_WRKSRC} - # Don't install any documentation for psptoolchain's gcc stage 1 - makes no sense. # Disable installation of .info files and libiberty for both stages. post-patch: @${REINPLACE_CMD} -E "s/^(install-data-am:)(.*)install-info-am(.*)/\1 \2 \3/" \ - ${SRCDIR}/libquadmath/Makefile.in - @${REINPLACE_CMD} -E "s/^(install:)(.*)/\1#\2/" ${SRCDIR}/libiberty/Makefile.in + ${PATCH_WRKSRC}/libquadmath/Makefile.in + @${REINPLACE_CMD} -E "s/^(install:)(.*)/\1#\2/" ${PATCH_WRKSRC}/libiberty/Makefile.in @${REINPLACE_CMD} -E \ -e "/^ \\$$\(mkinstalldirs\) \\$$\(DESTDIR\)\\$$\((infodir|man7dir)\)/d" \ -e "s/^(install-info:)(.*)/\1#\2/" \ -e "/^ \\$$\(DESTDIR\)\\$$\(man7dir\)\/(fsf-funding|gfdl|gpl)\\$$\(man7ext\)/d" \ - ${SRCDIR}/gcc/Makefile.in + ${PATCH_WRKSRC}/gcc/Makefile.in .if ${PKGNAMESUFFIX} == "-stage1" - @${REINPLACE_CMD} -E "s/^(install-man:)(.*)/\1#\2/" ${SRCDIR}/gcc/Makefile.in + @${REINPLACE_CMD} -E "s/^(install-man:)(.*)/\1#\2/" ${PATCH_WRKSRC}/gcc/Makefile.in .endif PLIST_SUB+= PSP_GCC_STAGE_PREFIX=${PSP_GCC_STAGE_PREFIX}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604131041.u3DAfnWd001140>