Date: Wed, 13 Apr 2016 10:40:58 +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: r413188 - in head/lang: gcc gcc46 gcc47 gcc48 gcc49 gcc5 gcc5-devel gcc6-devel Message-ID: <201604131040.u3DAewXB098256@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Wed Apr 13 10:40:58 2016 New Revision: 413188 URL: https://svnweb.freebsd.org/changeset/ports/413188 Log: lang/gcc*: convert to CONFIGURE_OUTSOURCE PR: 208294, 208309 Exp-run by: antoine Approved by: gerald (maintainer) Differential Revision: https://reviews.freebsd.org/D4157 Modified: head/lang/gcc/Makefile (contents, props changed) head/lang/gcc46/Makefile (contents, props changed) head/lang/gcc47/Makefile (contents, props changed) head/lang/gcc48/Makefile (contents, props changed) head/lang/gcc49/Makefile (contents, props changed) head/lang/gcc5-devel/Makefile (contents, props changed) head/lang/gcc5/Makefile (contents, props changed) head/lang/gcc6-devel/Makefile (contents, props changed) Modified: head/lang/gcc/Makefile ============================================================================== --- head/lang/gcc/Makefile Wed Apr 13 10:38:52 2016 (r413187) +++ head/lang/gcc/Makefile Wed Apr 13 10:40:58 2016 (r413188) @@ -37,9 +37,6 @@ USE_BINUTILS= yes USE_PERL5= build SSP_UNSAFE= yes -PATCH_WRKSRC= ${SRCDIR} -CONFIGURE_SCRIPT= ../${SRCDIR:S/${WRKDIR}\///}/configure - OPTIONS_DEFINE= BOOTSTRAP OPTIONS_DEFINE_i386= JAVA OPTIONS_DEFINE_amd64= JAVA @@ -82,11 +79,10 @@ MAKE_ARGS+=STAGE1_CXXFLAGS=-fbracket-dep .endif LANGUAGES:= c,c++,objc,fortran -SRCDIR= ${WRKDIR}/gcc-${DISTVERSION} -WRKSRC= ${WRKDIR}/build TARGLIB= ${PREFIX}/lib/gcc${SUFFIX} LIBEXEC= ${PREFIX}/libexec/gcc${SUFFIX} GNU_CONFIGURE= yes +CONFIGURE_OUTSOURCE= yes .if empty(PORT_OPTIONS:MBOOTSTRAP) CONFIGURE_ARGS+=--disable-bootstrap .else @@ -146,14 +142,13 @@ pre-everything:: @${ECHO_MSG} "Making GCC ${PORTVERSION} for ${CONFIGURE_TARGET} [${LANGUAGES}]" pre-configure: - cd ${SRCDIR} ; contrib/gcc_update --touch - @${RM} -f ${SRCDIR}/gcc/*/*.info* - @${MKDIR} ${CONFIGURE_WRKSRC} + cd ${WRKSRC} ; contrib/gcc_update --touch + @${RM} -f ${WRKSRC}/gcc/*/*.info* .if defined(MAINTAINER_MODE) full-regression-test: build - cd ${WRKSRC}; ${MAKE_CMD} -sk check \ - ; ${SRCDIR}/contrib/test_summary + cd ${TEST_WRKSRC}; ${MAKE_CMD} -sk check \ + ; ${WRKSRC}/contrib/test_summary .endif post-stage: Modified: head/lang/gcc46/Makefile ============================================================================== --- head/lang/gcc46/Makefile Wed Apr 13 10:38:52 2016 (r413187) +++ head/lang/gcc46/Makefile Wed Apr 13 10:40:58 2016 (r413188) @@ -38,9 +38,6 @@ USE_BINUTILS= yes USE_PERL5= build SSP_UNSAFE= yes -PATCH_WRKSRC= ${SRCDIR} -CONFIGURE_SCRIPT= ../${SRCDIR:S/${WRKDIR}\///}/configure - OPTIONS_DEFINE= BOOTSTRAP OPTIONS_DEFINE_i386= JAVA OPTIONS_DEFINE_amd64= JAVA @@ -58,11 +55,10 @@ CONFIGURE_TARGET= ${ARCH}-portbld-${OPSY .endif LANGUAGES:= c,c++,objc,fortran -SRCDIR= ${WRKDIR}/gcc-${DISTVERSION} -WRKSRC= ${WRKDIR}/build TARGLIB= ${PREFIX}/lib/gcc${SUFFIX} LIBEXEC= ${PREFIX}/libexec/gcc${SUFFIX} GNU_CONFIGURE= yes +CONFIGURE_OUTSOURCE= yes .if empty(PORT_OPTIONS:MBOOTSTRAP) CONFIGURE_ARGS+=--disable-bootstrap .else @@ -118,14 +114,13 @@ pre-everything:: @${ECHO_MSG} "Making GCC ${PORTVERSION} for ${CONFIGURE_TARGET} [${LANGUAGES}]" pre-configure: - cd ${SRCDIR} ; contrib/gcc_update --touch - @${RM} -f ${SRCDIR}/gcc/*/*.info* - @${MKDIR} ${CONFIGURE_WRKSRC} + cd ${WRKSRC} ; contrib/gcc_update --touch + @${RM} -f ${WRKSRC}/gcc/*/*.info* .if defined(MAINTAINER_MODE) full-regression-test: build - cd ${WRKSRC}; ${MAKE_CMD} -sk check \ - ; ${SRCDIR}/contrib/test_summary + cd ${TEST_WRKSRC}; ${MAKE_CMD} -sk check \ + ; ${WRKSRC}/contrib/test_summary .endif post-stage: Modified: head/lang/gcc47/Makefile ============================================================================== --- head/lang/gcc47/Makefile Wed Apr 13 10:38:52 2016 (r413187) +++ head/lang/gcc47/Makefile Wed Apr 13 10:40:58 2016 (r413188) @@ -39,9 +39,6 @@ USE_BINUTILS= yes USE_PERL5= build SSP_UNSAFE= yes -PATCH_WRKSRC= ${SRCDIR} -CONFIGURE_SCRIPT= ../${SRCDIR:S/${WRKDIR}\///}/configure - OPTIONS_DEFINE= BOOTSTRAP OPTIONS_DEFINE_i386= JAVA OPTIONS_DEFINE_amd64= JAVA @@ -63,11 +60,10 @@ CONFIGURE_ENV+= UNAME_m="powerpc64" .endif LANGUAGES:= c,c++,objc,fortran -SRCDIR= ${WRKDIR}/gcc-${DISTVERSION} -WRKSRC= ${WRKDIR}/build TARGLIB= ${PREFIX}/lib/gcc${SUFFIX} LIBEXEC= ${PREFIX}/libexec/gcc${SUFFIX} GNU_CONFIGURE= yes +CONFIGURE_OUTSOURCE= yes .if empty(PORT_OPTIONS:MBOOTSTRAP) CONFIGURE_ARGS+=--disable-bootstrap .else @@ -127,14 +123,13 @@ pre-everything:: @${ECHO_MSG} "Making GCC ${PORTVERSION} for ${CONFIGURE_TARGET} [${LANGUAGES}]" pre-configure: - cd ${SRCDIR} ; contrib/gcc_update --touch - @${RM} -f ${SRCDIR}/gcc/*/*.info* - @${MKDIR} ${CONFIGURE_WRKSRC} + cd ${WRKSRC} ; contrib/gcc_update --touch + @${RM} -f ${WRKSRC}/gcc/*/*.info* .if defined(MAINTAINER_MODE) full-regression-test: build - cd ${WRKSRC}; ${MAKE_CMD} -sk check \ - ; ${SRCDIR}/contrib/test_summary + cd ${TEST_WRKSRC}; ${MAKE_CMD} -sk check \ + ; ${WRKSRC}/contrib/test_summary .endif post-stage: Modified: head/lang/gcc48/Makefile ============================================================================== --- head/lang/gcc48/Makefile Wed Apr 13 10:38:52 2016 (r413187) +++ head/lang/gcc48/Makefile Wed Apr 13 10:40:58 2016 (r413188) @@ -39,9 +39,6 @@ USE_BINUTILS= yes USE_PERL5= build SSP_UNSAFE= yes -PATCH_WRKSRC= ${SRCDIR} -CONFIGURE_SCRIPT= ../${SRCDIR:S/${WRKDIR}\///}/configure - OPTIONS_DEFINE= BOOTSTRAP OPTIONS_DEFINE_i386= JAVA OPTIONS_DEFINE_amd64= JAVA @@ -73,11 +70,10 @@ CONFIGURE_ENV+= UNAME_m="powerpc64" .endif LANGUAGES:= c,c++,objc,fortran -SRCDIR= ${WRKDIR}/gcc-${DISTVERSION} -WRKSRC= ${WRKDIR}/build TARGLIB= ${PREFIX}/lib/gcc${SUFFIX} LIBEXEC= ${PREFIX}/libexec/gcc${SUFFIX} GNU_CONFIGURE= yes +CONFIGURE_OUTSOURCE= yes .if empty(PORT_OPTIONS:MBOOTSTRAP) CONFIGURE_ARGS+=--disable-bootstrap .else @@ -137,14 +133,13 @@ pre-everything:: @${ECHO_MSG} "Making GCC ${PORTVERSION} for ${CONFIGURE_TARGET} [${LANGUAGES}]" pre-configure: - cd ${SRCDIR} ; contrib/gcc_update --touch - @${RM} -f ${SRCDIR}/gcc/*/*.info* - @${MKDIR} ${CONFIGURE_WRKSRC} + cd ${WRKSRC} ; contrib/gcc_update --touch + @${RM} -f ${WRKSRC}/gcc/*/*.info* .if defined(MAINTAINER_MODE) full-regression-test: build - cd ${WRKSRC}; ${MAKE_CMD} -sk check \ - ; ${SRCDIR}/contrib/test_summary + cd ${TEST_WRKSRC}; ${MAKE_CMD} -sk check \ + ; ${WRKSRC}/contrib/test_summary .endif post-stage: Modified: head/lang/gcc49/Makefile ============================================================================== --- head/lang/gcc49/Makefile Wed Apr 13 10:38:52 2016 (r413187) +++ head/lang/gcc49/Makefile Wed Apr 13 10:40:58 2016 (r413188) @@ -39,9 +39,6 @@ USE_BINUTILS= yes USE_PERL5= build SSP_UNSAFE= yes -PATCH_WRKSRC= ${SRCDIR} -CONFIGURE_SCRIPT= ../${SRCDIR:S/${WRKDIR}\///}/configure - OPTIONS_DEFINE= BOOTSTRAP OPTIONS_DEFINE_i386= JAVA OPTIONS_DEFINE_amd64= JAVA @@ -87,11 +84,10 @@ MAKE_ARGS+=STAGE1_CXXFLAGS=-fbracket-dep .endif LANGUAGES:= c,c++,objc,fortran -SRCDIR= ${WRKDIR}/gcc-${DISTVERSION} -WRKSRC= ${WRKDIR}/build TARGLIB= ${PREFIX}/lib/gcc${SUFFIX} LIBEXEC= ${PREFIX}/libexec/gcc${SUFFIX} GNU_CONFIGURE= yes +CONFIGURE_OUTSOURCE= yes .if empty(PORT_OPTIONS:MBOOTSTRAP) CONFIGURE_ARGS+=--disable-bootstrap .else @@ -153,14 +149,13 @@ pre-everything:: @${ECHO_MSG} "Making GCC ${PORTVERSION} for ${CONFIGURE_TARGET} [${LANGUAGES}]" pre-configure: - cd ${SRCDIR} ; contrib/gcc_update --touch - @${RM} -f ${SRCDIR}/gcc/*/*.info* - @${MKDIR} ${CONFIGURE_WRKSRC} + cd ${WRKSRC} ; contrib/gcc_update --touch + @${RM} -f ${WRKSRC}/gcc/*/*.info* .if defined(MAINTAINER_MODE) full-regression-test: build - cd ${WRKSRC}; ${MAKE_CMD} -sk check \ - ; ${SRCDIR}/contrib/test_summary + cd ${TEST_WRKSRC}; ${MAKE_CMD} -sk check \ + ; ${WRKSRC}/contrib/test_summary .endif post-stage: Modified: head/lang/gcc5-devel/Makefile ============================================================================== --- head/lang/gcc5-devel/Makefile Wed Apr 13 10:38:52 2016 (r413187) +++ head/lang/gcc5-devel/Makefile Wed Apr 13 10:40:58 2016 (r413188) @@ -39,9 +39,6 @@ USE_BINUTILS= yes USE_PERL5= build SSP_UNSAFE= yes -PATCH_WRKSRC= ${SRCDIR} -CONFIGURE_SCRIPT= ../${SRCDIR:S/${WRKDIR}\///}/configure - OPTIONS_DEFINE= BOOTSTRAP GRAPHITE OPTIONS_DEFINE_i386= JAVA OPTIONS_DEFINE_amd64= JAVA @@ -86,11 +83,10 @@ MAKE_ARGS+=STAGE1_CXXFLAGS=-fbracket-dep .endif LANGUAGES:= c,c++,objc,fortran -SRCDIR= ${WRKDIR}/gcc-${DISTVERSION} -WRKSRC= ${WRKDIR}/build TARGLIB= ${PREFIX}/lib/gcc${SUFFIX} LIBEXEC= ${PREFIX}/libexec/gcc${SUFFIX} GNU_CONFIGURE= yes +CONFIGURE_OUTSOURCE= yes .if empty(PORT_OPTIONS:MBOOTSTRAP) CONFIGURE_ARGS+=--disable-bootstrap .else @@ -154,14 +150,13 @@ pre-everything:: @${ECHO_MSG} "Making GCC ${PORTVERSION} for ${CONFIGURE_TARGET} [${LANGUAGES}]" pre-configure: - cd ${SRCDIR} ; contrib/gcc_update --touch - @${RM} -f ${SRCDIR}/gcc/*/*.info* - @${MKDIR} ${CONFIGURE_WRKSRC} + cd ${WRKSRC} ; contrib/gcc_update --touch + @${RM} -f ${WRKSRC}/gcc/*/*.info* .if defined(MAINTAINER_MODE) full-regression-test: build - cd ${WRKSRC}; ${MAKE_CMD} -sk check \ - ; ${SRCDIR}/contrib/test_summary + cd ${TEST_WRKSRC}; ${MAKE_CMD} -sk check \ + ; ${WRKSRC}/contrib/test_summary .endif post-stage: Modified: head/lang/gcc5/Makefile ============================================================================== --- head/lang/gcc5/Makefile Wed Apr 13 10:38:52 2016 (r413187) +++ head/lang/gcc5/Makefile Wed Apr 13 10:40:58 2016 (r413188) @@ -39,9 +39,6 @@ USE_BINUTILS= yes USE_PERL5= build SSP_UNSAFE= yes -PATCH_WRKSRC= ${SRCDIR} -CONFIGURE_SCRIPT= ../${SRCDIR:S/${WRKDIR}\///}/configure - OPTIONS_DEFINE= BOOTSTRAP GRAPHITE OPTIONS_DEFINE_i386= JAVA OPTIONS_DEFINE_amd64= JAVA @@ -84,11 +81,10 @@ MAKE_ARGS+=STAGE1_CXXFLAGS=-fbracket-dep .endif LANGUAGES:= c,c++,objc,fortran -SRCDIR= ${WRKDIR}/gcc-${DISTVERSION} -WRKSRC= ${WRKDIR}/build TARGLIB= ${PREFIX}/lib/gcc${SUFFIX} LIBEXEC= ${PREFIX}/libexec/gcc${SUFFIX} GNU_CONFIGURE= yes +CONFIGURE_OUTSOURCE= yes .if empty(PORT_OPTIONS:MBOOTSTRAP) CONFIGURE_ARGS+=--disable-bootstrap .else @@ -153,14 +149,13 @@ pre-everything:: @${ECHO_MSG} "Making GCC ${PORTVERSION} for ${CONFIGURE_TARGET} [${LANGUAGES}]" pre-configure: - cd ${SRCDIR} ; contrib/gcc_update --touch - @${RM} -f ${SRCDIR}/gcc/*/*.info* - @${MKDIR} ${CONFIGURE_WRKSRC} + cd ${WRKSRC} ; contrib/gcc_update --touch + @${RM} -f ${WRKSRC}/gcc/*/*.info* .if defined(MAINTAINER_MODE) full-regression-test: build - cd ${WRKSRC}; ${MAKE_CMD} -sk check \ - ; ${SRCDIR}/contrib/test_summary + cd ${TEST_WRKSRC}; ${MAKE_CMD} -sk check \ + ; ${WRKSRC}/contrib/test_summary .endif post-stage: Modified: head/lang/gcc6-devel/Makefile ============================================================================== --- head/lang/gcc6-devel/Makefile Wed Apr 13 10:38:52 2016 (r413187) +++ head/lang/gcc6-devel/Makefile Wed Apr 13 10:40:58 2016 (r413188) @@ -39,9 +39,6 @@ USE_BINUTILS= yes USE_PERL5= build SSP_UNSAFE= yes -PATCH_WRKSRC= ${SRCDIR} -CONFIGURE_SCRIPT= ../${SRCDIR:S/${WRKDIR}\///}/configure - OPTIONS_DEFINE= BOOTSTRAP GRAPHITE OPTIONS_DEFINE_i386= JAVA OPTIONS_DEFINE_amd64= JAVA @@ -87,11 +84,10 @@ MAKE_ARGS+=STAGE1_CXXFLAGS=-fbracket-dep .endif LANGUAGES:= c,c++,objc,fortran -SRCDIR= ${WRKDIR}/gcc-${DISTVERSION} -WRKSRC= ${WRKDIR}/build TARGLIB= ${PREFIX}/lib/gcc${SUFFIX} LIBEXEC= ${PREFIX}/libexec/gcc${SUFFIX} GNU_CONFIGURE= yes +CONFIGURE_OUTSOURCE= yes .if empty(PORT_OPTIONS:MBOOTSTRAP) CONFIGURE_ARGS+=--disable-bootstrap .else @@ -155,14 +151,13 @@ pre-everything:: @${ECHO_MSG} "Making GCC ${PORTVERSION} for ${CONFIGURE_TARGET} [${LANGUAGES}]" pre-configure: - cd ${SRCDIR} ; contrib/gcc_update --touch - @${RM} -f ${SRCDIR}/gcc/*/*.info* - @${MKDIR} ${CONFIGURE_WRKSRC} + cd ${WRKSRC} ; contrib/gcc_update --touch + @${RM} -f ${WRKSRC}/gcc/*/*.info* .if defined(MAINTAINER_MODE) full-regression-test: build - cd ${WRKSRC}; ${MAKE_CMD} -sk check \ - ; ${SRCDIR}/contrib/test_summary + cd ${TEST_WRKSRC}; ${MAKE_CMD} -sk check \ + ; ${WRKSRC}/contrib/test_summary .endif post-stage:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604131040.u3DAewXB098256>