diff --git a/lang/gcc12-devel/Makefile b/lang/gcc12-devel/Makefile index 5f5532654f68..63ae6f529a12 100644 --- a/lang/gcc12-devel/Makefile +++ b/lang/gcc12-devel/Makefile @@ -1,165 +1,165 @@ # Created by: Gerald Pfeifer PORTNAME= gcc -PORTVERSION= 12.0.0.s20210919 +PORTVERSION= 12.0.0.s20210926 CATEGORIES= lang MASTER_SITES= GCC/snapshots/${DIST_VERSION} PKGNAMESUFFIX= ${SUFFIX}-devel DISTNAME= gcc-${DIST_VERSION} MAINTAINER= gerald@FreeBSD.org COMMENT= GNU Compiler Collection 12 LICENSE= GPLv3 GPLv3RLE LICENSE_COMB= multi ONLY_FOR_ARCHS= aarch64 amd64 arm armv6 armv7 i386 powerpc powerpc64 powerpc64le LIB_DEPENDS= libgmp.so:math/gmp \ libmpfr.so:math/mpfr \ libmpc.so:math/mpc BUILD_DEPENDS+= ${LOCALBASE}/bin/as:devel/binutils RUN_DEPENDS+= ${LOCALBASE}/bin/as:devel/binutils .if defined(MAINTAINER_MODE) BUILD_DEPENDS+= runtest:misc/dejagnu .endif USES= compiler:c++11-lang cpe gmake iconv libtool makeinfo perl5 tar:xz USE_BINUTILS= yes USE_PERL5= build CPE_VENDOR= gnu CPE_VERSION= ${GCC_VERSION} # DIST_VERSION relates to downloads, GCC_VERSION and SUFFIX to names # of executables and directories once installed. A PORTVERSION of # Y.2.1.s20140817 results in values of Y-20140817, Y.2.1, and Y # for these three. DIST_VERSION= ${PORTVERSION:C/([0-9]+).*\.s([0-9]+)/\1-\2/} GCC_VERSION= ${PORTVERSION:C/(.+)\.s[0-9]{8}/\1/} SUFFIX= ${PORTVERSION:C/([0-9]+).*/\1/} CFLAGS:= ${CFLAGS:N-mretpoline} CXXFLAGS:= ${CXXFLAGS:N-mretpoline} OPTIONS_DEFINE= BOOTSTRAP GRAPHITE OPTIONS_DEFAULT= BOOTSTRAP BOOTSTRAP_DESC= Build using a full bootstrap GRAPHITE_DESC= Support for Graphite loop optimizations .if exists(/usr/lib32/libc.so) OPTIONS_DEFINE_amd64+= MULTILIB OPTIONS_DEFAULT_amd64+= MULTILIB OPTIONS_DEFINE_powerpc64+= MULTILIB OPTIONS_DEFAULT_powerpc64+= MULTILIB MULTILIB_DESC= Build support for 32-bit and 64-bit targets MULTILIB_CONFIGURE_ENABLE= multilib .else CONFIGURE_ARGS+= --disable-multilib .endif .include .if ${ARCH} == amd64 CONFIGURE_TARGET= x86_64-portbld-${OPSYS:tl}${OSREL} .elif ${ARCH} == powerpc64 CONFIGURE_ENV+= UNAME_m="powerpc64" . if defined(PPC_ABI) && ${PPC_ABI} == ELFv2 CONFIGURE_ARGS+= --with-abi=elfv2 . endif USE_GCC= yes .elif ${ARCH} == powerpc64le USE_GCC= yes .endif LANGUAGES:= c,c++,objc,fortran,jit TARGLIB= ${PREFIX}/lib/gcc${SUFFIX} TARGLIB32= ${PREFIX}/lib32 # The version information is added later LIBEXEC= ${PREFIX}/libexec/gcc${SUFFIX} GNU_CONFIGURE= yes CONFIGURE_OUTSOURCE= yes .if empty(PORT_OPTIONS:MBOOTSTRAP) CONFIGURE_ARGS+=--disable-bootstrap .else CONFIGURE_ARGS+=--with-build-config=bootstrap-debug ALL_TARGET= bootstrap-lean .endif INSTALL_TARGET= install-strip .if ${UID} != 0 BINMODE= 755 .endif CONFIGURE_ARGS+=--disable-nls \ --enable-gnu-indirect-function \ --enable-host-shared \ --enable-plugin \ --libdir=${TARGLIB} \ --libexecdir=${LIBEXEC} \ --program-suffix=${SUFFIX} \ --with-as=${LOCALBASE}/bin/as \ --with-gmp=${LOCALBASE} \ --with-gxx-include-dir=${TARGLIB}/include/c++/ \ --with-ld=${LOCALBASE}/bin/ld \ ${ICONV_CONFIGURE_ARG} \ --with-pkgversion="FreeBSD Ports Collection" \ --with-system-zlib \ --without-zstd MAKE_ARGS+= MAKEINFOFLAGS="--no-split" USE_LDCONFIG= ${TARGLIB} PLIST_SUB+= GCC_VERSION=${GCC_VERSION} \ GNU_HOST=${CONFIGURE_TARGET} \ SUFFIX=${SUFFIX} INFO= gcc${SUFFIX}/cpp \ gcc${SUFFIX}/cppinternals \ gcc${SUFFIX}/gcc \ gcc${SUFFIX}/gccinstall \ gcc${SUFFIX}/gccint \ gcc${SUFFIX}/gfortran \ gcc${SUFFIX}/libgccjit \ gcc${SUFFIX}/libgomp .if ${ARCH} == amd64 || ${ARCH} == i386 INFO+= gcc${SUFFIX}/libquadmath \ gcc${SUFFIX}/libitm .endif SUB_FILES= pkg-message SUB_LIST+= TARGLIB=${TARGLIB} .if ${PORT_OPTIONS:MGRAPHITE} LIB_DEPENDS+= libisl.so:devel/isl CONFIGURE_ARGS+=--with-isl=${LOCALBASE} .endif CONFIGURE_ARGS+=--enable-languages=${LANGUAGES} pre-everything:: @${ECHO_MSG} "Making GCC ${PORTVERSION} for ${CONFIGURE_TARGET} [${LANGUAGES}]" pre-configure: cd ${WRKSRC} ; contrib/gcc_update --touch @${RM} ${WRKSRC}/gcc/*/*.info* .if defined(MAINTAINER_MODE) full-regression-test: build cd ${TEST_WRKSRC}; ${MAKE_CMD} -sk check \ ; ${WRKSRC}/contrib/test_summary .endif post-stage: ${RM} ${STAGEDIR}${PREFIX}/man/man7/* ${RM} -r ${STAGEDIR}${TARGLIB}/gcc/*/${GCC_VERSION}/include-fixed/ # Add target libraries and include files to packaging list. ${RM} ${WRKDIR}/PLIST.lib .if (${ARCH} == amd64 || ${ARCH} == powerpc64) && ${PORT_OPTIONS:MMULTILIB} ${MKDIR} ${STAGEDIR}${TARGLIB32} ${MV} ${STAGEDIR}${PREFIX}/lib/lib32 ${STAGEDIR}${TARGLIB32}/gcc${SUFFIX} .endif .for d in ${TARGLIB:S/^${PREFIX}\///} ${TARGLIB32:S/^${PREFIX}\///} ${LIBEXEC:S/^${PREFIX}\///} cd ${STAGEDIR}${PREFIX} ; if [ -d $d ]; then \ ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\ fi .endfor cd ${WRKDIR} ; ${SED} -i -e "/PLIST.lib/ r PLIST.lib" ${TMPPLIST} .include diff --git a/lang/gcc12-devel/distinfo b/lang/gcc12-devel/distinfo index b317b72ea341..b7a8cf785ad7 100644 --- a/lang/gcc12-devel/distinfo +++ b/lang/gcc12-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1632516336 -SHA256 (gcc-12-20210919.tar.xz) = 3f046195d02225d4f072b3a50efca4a791c00f369bfb5c6cf68d82bcffeba988 -SIZE (gcc-12-20210919.tar.xz) = 76962072 +TIMESTAMP = 1633336964 +SHA256 (gcc-12-20210926.tar.xz) = bf0225ac83a4c586221c0daa16583769e1bc9e67af9c5b0ebeee3b5f01b1117c +SIZE (gcc-12-20210926.tar.xz) = 77037992 diff --git a/lang/gcc12-devel/files/patch-bootstrap-gcc-gcc.c b/lang/gcc12-devel/files/patch-bootstrap-gcc-gcc.c deleted file mode 100644 index 7f896ccd273d..000000000000 --- a/lang/gcc12-devel/files/patch-bootstrap-gcc-gcc.c +++ /dev/null @@ -1,47 +0,0 @@ -commit abdf63d782cba82b5ecf264248518cbb065650ed -Author: Iain Sandoe -Date: Mon Sep 20 07:41:49 2021 +0100 - - Driver: Fix bootstrap with DEFAULT_{ASSEMBLER,LINKER,DSYMUTIL}. - - The patch at r12-3662-g5fee8a0a9223d factored the code for - printing the names of programes into a separate function. - However the moved editions that print out the names of the - assembler, linker (and dsymutil on Darwin) when those are - specified at configure-time were not adjusted accordingly, - leading to a bootstrap fail. - - Fixed by testing specifically for execute OK, since we know - these are programs. - - Signed-off-by: Iain Sandoe - - gcc/ChangeLog: - - * gcc.c: Test for execute OK when we find the - programs for assembler linker and dsymutil and those - were specified at configure-time. - ---- gcc/gcc.c -+++ gcc/gcc.c -@@ -3083,17 +3083,17 @@ find_a_program (const char *name) - /* Do not search if default matches query. */ - - #ifdef DEFAULT_ASSEMBLER -- if (! strcmp (name, "as") && access (DEFAULT_ASSEMBLER, mode) == 0) -+ if (! strcmp (name, "as") && access (DEFAULT_ASSEMBLER, X_OK) == 0) - return xstrdup (DEFAULT_ASSEMBLER); - #endif - - #ifdef DEFAULT_LINKER -- if (! strcmp (name, "ld") && access (DEFAULT_LINKER, mode) == 0) -+ if (! strcmp (name, "ld") && access (DEFAULT_LINKER, X_OK) == 0) - return xstrdup (DEFAULT_LINKER); - #endif - - #ifdef DEFAULT_DSYMUTIL -- if (! strcmp (name, "dsymutil") && access (DEFAULT_DSYMUTIL, mode) == 0) -+ if (! strcmp (name, "dsymutil") && access (DEFAULT_DSYMUTIL, X_OK) == 0) - return xstrdup (DEFAULT_DSYMUTIL); - #endif -