diff --git a/lang/gcc12-devel/Makefile b/lang/gcc12-devel/Makefile index f814e2948aee..a3a9500e484e 100644 --- a/lang/gcc12-devel/Makefile +++ b/lang/gcc12-devel/Makefile @@ -1,177 +1,170 @@ # Created by: Gerald Pfeifer PORTNAME= gcc -PORTVERSION= 12.0.1.s20220306 -PORTREVISION= 2 +PORTVERSION= 12.0.1.s20220430 CATEGORIES= lang MASTER_SITES= GCC/snapshots/${DIST_VERSION} PKGNAMESUFFIX= ${SUFFIX}-devel DISTNAME= gcc-${DIST_VERSION} MAINTAINER= toolchain@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= GRAPHITE OPTIONS_DEFAULT_aarch64=LTO_BOOTSTRAP OPTIONS_DEFAULT_amd64= LTO_BOOTSTRAP OPTIONS_DEFAULT_i386= LTO_BOOTSTRAP OPTIONS_DEFAULT_powerpc=LTO_BOOTSTRAP OPTIONS_DEFAULT_powerpc64=LTO_BOOTSTRAP OPTIONS_DEFAULT_powerpc64le=LTO_BOOTSTRAP OPTIONS_RADIO= BOOTSTRAP OPTIONS_RADIO_BOOTSTRAP= LTO_BOOTSTRAP STANDARD_BOOTSTRAP LTO_BOOTSTRAP_DESC= Build using a full LTO bootstrap STANDARD_BOOTSTRAP_DESC= Build using a full bootstrap without LTO 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 +.elif 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:M*BOOTSTRAP) CONFIGURE_ARGS+=--disable-bootstrap .elif ${PORT_OPTIONS:MLTO_BOOTSTRAP} CONFIGURE_ARGS+=--with-build-config=bootstrap-lto-noplugin ALL_TARGET= bootstrap-lean .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 f0004511149a..f3056bdbd8b5 100644 --- a/lang/gcc12-devel/distinfo +++ b/lang/gcc12-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1646986300 -SHA256 (gcc-12-20220306.tar.xz) = 3a48aa25eedef45b2edd809b910d288046cbd65a048ea31b9fb85793029b234b -SIZE (gcc-12-20220306.tar.xz) = 78811636 +TIMESTAMP = 1651388552 +SHA256 (gcc-12-20220430.tar.xz) = 9255efd2b556e229f589f920e08a678d4be537ba088efff5b8809e9715a68911 +SIZE (gcc-12-20220430.tar.xz) = 79067316 diff --git a/lang/gcc12-devel/files/patch-clang-vec_step b/lang/gcc12-devel/files/patch-clang-vec_step new file mode 100644 index 000000000000..00607540eb2a --- /dev/null +++ b/lang/gcc12-devel/files/patch-clang-vec_step @@ -0,0 +1,21 @@ +https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=239266 reports how +clang unfortunately poisons user namespace by default (without any +special options). + +Until that changes (or GCC changes) we need to avoid using vec_step +as a variable. + +--- UTC +Index: gcc/tree-vect-loop.cc +=================================================================== +--- gcc/tree-vect-loop.cc (revision 273856) ++++ gcc/tree-vect-loop.cc (working copy) +@@ -55,6 +55,8 @@ along with GCC; see the file COPYING3. If not see + #include "vec-perm-indices.h" + #include "tree-eh.h" + ++#define vec_step vec_step_ ++ + /* Loop Vectorization Pass. + + This pass tries to vectorize loops.