diff --git a/devel/freebsd-gcc9/Makefile b/devel/freebsd-gcc9/Makefile index 32a202748df3..ed873a1de38b 100644 --- a/devel/freebsd-gcc9/Makefile +++ b/devel/freebsd-gcc9/Makefile @@ -1,152 +1,156 @@ PORTNAME= gcc -PORTVERSION= 9.3.0 -PORTREVISION= 1 +PORTVERSION= 9.5.0 CATEGORIES= devel MASTER_SITES= GCC PKGNAMEPREFIX= ${TARGETARCH}- PKGNAMESUFFIX= ${SUFFIX} MAINTAINER= jhb@FreeBSD.org COMMENT= Cross GNU Compiler Collection for ${TARGETARCH} LICENSE= GPLv3 GPLv3RLE LICENSE_COMB= multi BUILD_DEPENDS= ${BU_PREFIX}-as:devel/binutils@${BU_FLAVOR} \ objdump:devel/binutils LIB_DEPENDS= libgmp.so:math/gmp \ libmpfr.so:math/mpfr \ libmpc.so:math/mpc RUN_DEPENDS= ${BU_PREFIX}-as:devel/binutils@${BU_FLAVOR} FLAVORS= aarch64 amd64 armv6 armv7 i386 mips mips64 powerpc powerpc64 riscv64 sparc64 TARGETARCH= ${FLAVOR} USES= compiler:c++11-lang cpe gmake iconv libtool makeinfo tar:xz CPE_VENDOR= gnu PLIST_SUB= OPSYS=${OPSYS:tl} \ SUFFIX=${SUFFIX} \ TARGETARCH=${TARGETARCH} \ GCC_TARGET=${GCC_TARGET} \ GCC_VERSION=${PORTVERSION} SUB_FILES= xtoolchain.mk SUB_LIST= BU_PREFIX=${BU_PREFIX} \ GCC_TARGET=${GCC_TARGET} \ SUFFIX=${SUFFIX} SUFFIX= ${PORTVERSION:C/([0-9]+).*/\1/} GNU_CONFIGURE= yes CONFIGURE_OUTSOURCE= yes CONFIGURE_ARGS+=--target=${GCC_TARGET} --disable-nls --enable-languages=c,c++ \ --enable-gnu-indirect-function \ --enable-initfini-array \ --program-prefix=${GCC_TARGET}- \ --program-suffix=${SUFFIX} \ --without-headers \ --with-gmp=${LOCALBASE} \ --with-pkgversion="FreeBSD Ports Collection for ${PKGNAMEPREFIX:C/-//g}" \ --with-system-zlib \ + --without-zstd \ --with-gxx-include-dir=/usr/include/c++/v1/ \ --with-sysroot="/" \ --with-as=${LOCALBASE}/bin/${BU_PREFIX}-as \ --with-ld=${LOCALBASE}/bin/${BU_PREFIX}-ld +.if ${TARGETARCH:Mpowerpc64*} +CONFIGURE_ARGS+=--with-abi=elfv2 +.endif + ALL_TARGET= all-gcc INSTALL_TARGET= install-gcc .include .if ${TARGETARCH:Marm*} TARGET_ABI= gnueabi BU_FLAVOR= arm_${TARGET_ABI} BU_PREFIX= arm-${TARGET_ABI}-${OPSYS:tl}${OSREL} .else TARGET_ABI= unknown BU_FLAVOR= ${TARGETARCH} BU_PREFIX= ${GCC_TARGET} .endif GCC_TARGET= ${TARGETARCH:S/amd64/x86_64/}-${TARGET_ABI}-${OPSYS:tl}${OSREL} post-patch: @${REINPLACE_CMD} -e '/LIBSTDCXX/ s/stdc\+\+/c\+\+/g ' \ ${WRKSRC}//gcc/cp/g++spec.c @${REINPLACE_CMD} -e '/LOCAL_INCLUDE_DIR/ d ' \ ${WRKSRC}//gcc/Makefile.in .if ${ARCH} == "amd64" CONFIGURE_TARGET= x86_64-unknown-${OPSYS:tl}${OSREL} .else CONFIGURE_TARGET= ${ARCH}-unknown-${OPSYS:tl}${OSREL} .endif .if ${TARGETARCH:Marm*} || ${TARGETARCH} == "aarch64" . if ${COMPILER_TYPE} == clang MAKE_ARGS+=CXXFLAGS=-fbracket-depth=512 . endif .endif .if ${TARGETARCH} == "amd64" || ${TARGETARCH} == "powerpc64" CONFIGURE_ARGS+=--enable-multilib .endif .if ${ARCH} == "aarch64" PLIST_SUB+= PLUGINS="@comment plugin does not build" .else PLIST_SUB+= PLUGINS="" .endif .if ${TARGETARCH} == "amd64" || ${TARGETARCH} == "i386" PLIST_SUB+= FLOAT_H="@comment " .else PLIST_SUB+= FLOAT_H="" .endif PLIST= ${.CURDIR}/pkg-plist .if ${TARGETARCH} == "aarch64" PLIST+= ${.CURDIR}/pkg-plist.aarch64 .endif .if ${TARGETARCH} == "aarch64" || ${TARGETARCH:Marm*} PLIST+= ${.CURDIR}/pkg-plist.arm .endif .if ${TARGETARCH:Marm*} PLIST+= ${.CURDIR}/pkg-plist.arm_gnueabi .endif .if ${TARGETARCH} == "amd64" PLIST+= ${.CURDIR}/pkg-plist.amd64 .endif .if ${TARGETARCH} == "amd64" || ${TARGETARCH} == "i386" PLIST+= ${.CURDIR}/pkg-plist.i386 .endif .if ${TARGETARCH:Mmips*} PLIST+= ${.CURDIR}/pkg-plist.mips .endif .if ${TARGETARCH:Mpowerpc64*} PLIST+= ${.CURDIR}/pkg-plist.powerpc64 .elif ${TARGETARCH:Mpowerpc*} PLIST+= ${.CURDIR}/pkg-plist.powerpc .endif .if ${TARGETARCH:Mriscv*} PLIST+= ${.CURDIR}/pkg-plist.riscv .endif .if ${TARGETARCH} == "sparc64" PLIST+= ${.CURDIR}/pkg-plist.sparc64 .endif post-install: @${RM} ${STAGEDIR}${PREFIX}/bin/${GCC_TARGET}-${GCC_TARGET}-* @${RM} ${STAGEDIR}${PREFIX}/share/info/* @${RM} ${STAGEDIR}${PREFIX}/man/man7/* @${RM} -r ${STAGEDIR}${PREFIX}/lib/gcc/${GCC_TARGET}/${PORTVERSION}/include-fixed .if ${TARGETARCH} == "amd64" || ${TARGETARCH} == "i386" # Conflicts with sys/x86/include/float.h ${RM} ${STAGEDIR}${PREFIX}/lib/gcc/${GCC_TARGET}/${PORTVERSION}/include/float.h .endif ${MKDIR} ${STAGEDIR}${PREFIX}/share/toolchains/ ${INSTALL_DATA} ${WRKDIR}/xtoolchain.mk \ ${STAGEDIR}${PREFIX}/share/toolchains/${TARGETARCH}-gcc${SUFFIX}.mk .include diff --git a/devel/freebsd-gcc9/distinfo b/devel/freebsd-gcc9/distinfo index 4a1d0fcf4182..3495406ad131 100644 --- a/devel/freebsd-gcc9/distinfo +++ b/devel/freebsd-gcc9/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1595179652 -SHA256 (gcc-9.3.0.tar.xz) = 71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1 -SIZE (gcc-9.3.0.tar.xz) = 70533868 +TIMESTAMP = 1654895134 +SHA256 (gcc-9.5.0.tar.xz) = 27769f64ef1d4cd5e2be8682c0c93f9887983e6cfd1a927ce5a0a2915a95cf8f +SIZE (gcc-9.5.0.tar.xz) = 72462752 diff --git a/devel/freebsd-gcc9/files/patch-libcpp_lex.c b/devel/freebsd-gcc9/files/patch-libcpp_lex.c deleted file mode 100644 index 05ad28872d11..000000000000 --- a/devel/freebsd-gcc9/files/patch-libcpp_lex.c +++ /dev/null @@ -1,25 +0,0 @@ -This is - - commit cd547f0ddcd3a54e5b73bcda5ac0f0c46808db8b - Author: Jakub Jelinek - Date: Sat Sep 26 10:07:41 2020 +0200 - -which is on the GCC 10 release branch and thus part of lang/gcc10-devel; -we should automatically get it with GCC 10.3. - ---- libcpp/lex.c.orig 2020-11-02 10:24:50 UTC -+++ libcpp/lex.c -@@ -531,11 +531,11 @@ init_vectorized_lexer (void) - search_line_fast = impl; - } - --#elif defined(_ARCH_PWR8) && defined(__ALTIVEC__) -+#elif (GCC_VERSION >= 4005) && defined(_ARCH_PWR8) && defined(__ALTIVEC__) - - /* A vection of the fast scanner using AltiVec vectorized byte compares - and VSX unaligned loads (when VSX is available). This is otherwise -- the same as the pre-GCC 5 version. */ -+ the same as the AltiVec version. */ - - ATTRIBUTE_NO_SANITIZE_UNDEFINED - static const uchar *