diff --git a/lang/gcc12/Makefile b/lang/gcc12/Makefile index beba427302f6..0d28ba3fd5c6 100644 --- a/lang/gcc12/Makefile +++ b/lang/gcc12/Makefile @@ -1,184 +1,184 @@ PORTNAME= gcc -PORTVERSION= 12.3.0 +PORTVERSION= 12.4.0 CATEGORIES= lang MASTER_SITES= GCC PKGNAMESUFFIX= ${SUFFIX} MAINTAINER= salvadore@FreeBSD.org COMMENT= GNU Compiler Collection 12 WWW= https://gcc.gnu.org LICENSE= GPLv3 GPLv3RLE LICENSE_COMB= multi ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386 powerpc powerpc64 powerpc64le riscv64 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 CONFLICTS= gcc12-devel CPE_VENDOR= gnu GCC_VERSION= ${PORTVERSION} SUFFIX= ${PORTVERSION:C/([0-9]+).*/\1/} CFLAGS:= ${CFLAGS:N-mretpoline} CXXFLAGS:= ${CXXFLAGS:N-mretpoline} OPTIONS_DEFINE= GRAPHITE OPTIONS_DEFAULT_aarch64=STANDARD_BOOTSTRAP OPTIONS_DEFAULT_amd64= STANDARD_BOOTSTRAP OPTIONS_DEFAULT_i386= STANDARD_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 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105010 MULTILIB_DESC= Build support for 32-bit and 64-bit targets MULTILIB_CONFIGURE_ENABLE= multilib .else CONFIGURE_ARGS+= --disable-multilib .endif .if defined(CPUTYPE) && ${CPUTYPE:Mg[3-5]} CFLAGS:= ${CFLAGS:S/mcpu=g/mcpu=G/} CXXFLAGS:= ${CFLAGS:S/mcpu=g/mcpu=G/} .endif .include # Extraction fails with poudriere on aarch64 for GCC 12. # It seems that the bug is specific to lang/gcc11 and lang/gcc12 only. # No other GCC port is affected. # See https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=271052 # and https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=246670 .if ${ARCH} == aarch64 EXTRACT_CMD= ${SETENV} LC_ALL=en_US.UTF-8 /usr/bin/bsdtar .endif .if ${ARCH} == amd64 CONFIGURE_TARGET= x86_64-portbld-${OPSYS:tl}${OSREL} .elif ${ARCH} == powerpc64 CONFIGURE_ARGS+= --with-abi=elfv2 .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 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share 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 PIE_UNSAFE= yes .else CONFIGURE_ARGS+=--with-build-config=bootstrap-debug ALL_TARGET= bootstrap-lean PIE_UNSAFE= yes .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-gxx-libcxx-include-dir=/usr/include/c++/v1 \ --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 # Release tarballs (as opposed to snapshots) always carry this. INFO+= gcc${SUFFIX}/libquadmath \ gcc${SUFFIX}/libitm 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}/share/man/man7/* ${RM} -r ${STAGEDIR}${TARGLIB}/gcc/*/${GCC_VERSION}/include-fixed/ # Install ISO_Fortran_binding.h in an easily findable directory ${MKDIR} ${STAGEDIR}${PREFIX}/include/gcc${SUFFIX} ${INSTALL_DATA} ${STAGEDIR}${PREFIX}/lib/gcc${SUFFIX}/gcc/${CONFIGURE_TARGET}/${GCC_VERSION}/include/ISO_Fortran_binding.h \ ${STAGEDIR}${PREFIX}/include/gcc${SUFFIX} # 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/distinfo b/lang/gcc12/distinfo index 1736f42f015f..e90d6d8bcef9 100644 --- a/lang/gcc12/distinfo +++ b/lang/gcc12/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1699355292 -SHA256 (gcc-12.3.0.tar.xz) = 949a5d4f99e786421a93b532b22ffab5578de7321369975b91aec97adfda8c3b -SIZE (gcc-12.3.0.tar.xz) = 85491976 +TIMESTAMP = 1724162795 +SHA256 (gcc-12.4.0.tar.xz) = 704f652604ccbccb14bdabf3478c9511c89788b12cb3bbffded37341916a9175 +SIZE (gcc-12.4.0.tar.xz) = 83377372 diff --git a/lang/gcc12/files/patch-gcc_configure b/lang/gcc12/files/patch-gcc_configure new file mode 100644 index 000000000000..cc60593ba6f7 --- /dev/null +++ b/lang/gcc12/files/patch-gcc_configure @@ -0,0 +1,22 @@ +Enable support for .init_array and .fini_array, which FreeBSD supports +since commit 83aa9cc00c2d83d05a0efe7a1496d8aab4a153bb in the src +repository. + +There __FreeBSD_version is 1000009, so we start enabling the support +from __FreeBSD_version == 1000010. +--- gcc/configure.orig 2023-05-11 22:33:34 UTC ++++ gcc/configure +@@ -24214,6 +24214,13 @@ EOF + #else + # if defined __sun__ && defined __svr4__ + /* Solaris ld.so.1 supports .init_array/.fini_array since Solaris 8. */ ++# elif defined __FreeBSD__ ++# include ++# if __FreeBSD_version >= 1000010 ++ /* FreeBSD supports .init_array/.fini_array since FreeBSD 10. */ ++# else ++# error The C library not known to support .init_array/.fini_array ++# endif + # else + # error The C library not known to support .init_array/.fini_array + # endif diff --git a/lang/gcc12/files/patch-gcc_system.h b/lang/gcc12/files/patch-gcc_system.h deleted file mode 100644 index 7a18af14077a..000000000000 --- a/lang/gcc12/files/patch-gcc_system.h +++ /dev/null @@ -1,42 +0,0 @@ ---- gcc/system.h.orig 2022-08-19 08:09:53 UTC -+++ gcc/system.h -@@ -203,19 +203,6 @@ extern int fprintf_unlocked (FILE *, const char *, ... - #endif - #endif - --/* There are an extraordinary number of issues with . -- The last straw is that it varies with the locale. Use libiberty's -- replacement instead. */ --#include "safe-ctype.h" -- --#include -- --#include -- --#if !defined (errno) && defined (HAVE_DECL_ERRNO) && !HAVE_DECL_ERRNO --extern int errno; --#endif -- - #ifdef __cplusplus - #if defined (INCLUDE_ALGORITHM) || !defined (HAVE_SWAP_IN_UTILITY) - # include -@@ -243,6 +230,19 @@ extern int errno; - # include - # include - # include -+#endif -+ -+/* There are an extraordinary number of issues with . -+ The last straw is that it varies with the locale. Use libiberty's -+ replacement instead. */ -+#include "safe-ctype.h" -+ -+#include -+ -+#include -+ -+#if !defined (errno) && defined (HAVE_DECL_ERRNO) && !HAVE_DECL_ERRNO -+extern int errno; - #endif - - /* Some of glibc's string inlines cause warnings. Plus we'd rather diff --git a/lang/gcc12/files/patch-libcc1_libcc1plugin.cc b/lang/gcc12/files/patch-libcc1_libcc1plugin.cc deleted file mode 100644 index d54adddb021b..000000000000 --- a/lang/gcc12/files/patch-libcc1_libcc1plugin.cc +++ /dev/null @@ -1,19 +0,0 @@ ---- libcc1/libcc1plugin.cc.orig 2023-07-27 08:13:07 UTC -+++ libcc1/libcc1plugin.cc -@@ -32,6 +32,7 @@ - #undef PACKAGE_VERSION - - #define INCLUDE_MEMORY -+#define INCLUDE_VECTOR - #include "gcc-plugin.h" - #include "system.h" - #include "coretypes.h" -@@ -68,8 +69,6 @@ - #include "rpc.hh" - #include "gcc-c-interface.h" - #include "context.hh" -- --#include - - using namespace cc1_plugin; - diff --git a/lang/gcc12/files/patch-libcc1_libcp1plugin.cc b/lang/gcc12/files/patch-libcc1_libcp1plugin.cc deleted file mode 100644 index 0f3d2d161404..000000000000 --- a/lang/gcc12/files/patch-libcc1_libcp1plugin.cc +++ /dev/null @@ -1,19 +0,0 @@ ---- libcc1/libcp1plugin.cc.orig 2023-07-27 08:13:07 UTC -+++ libcc1/libcp1plugin.cc -@@ -33,6 +33,7 @@ - #undef PACKAGE_VERSION - - #define INCLUDE_MEMORY -+#define INCLUDE_VECTOR - #include "gcc-plugin.h" - #include "system.h" - #include "coretypes.h" -@@ -70,8 +71,6 @@ - #include "marshall-cp.hh" - #include "rpc.hh" - #include "context.hh" -- --#include - - using namespace cc1_plugin; -