diff --git a/devel/avr-gcc/Makefile b/devel/avr-gcc/Makefile index 06798f270ff4..455f1e58085a 100644 --- a/devel/avr-gcc/Makefile +++ b/devel/avr-gcc/Makefile @@ -1,81 +1,81 @@ PORTNAME= gcc -PORTVERSION= 10.2.0 +PORTVERSION= 10.3.0 CATEGORIES= devel MASTER_SITES= GCC PKGNAMEPREFIX= avr- MAINTAINER= joerg@FreeBSD.org COMMENT= FSF GCC for Atmel AVR 8-bit RISC cross-development LICENSE= GPLv3 GPLv3RLE LICENSE_COMB= multi BROKEN_mips64= Fails to configure: cannot compute suffix of object files BUILD_DEPENDS= avr-as:devel/binutils@avr \ avr-ld:devel/binutils@avr \ objdump:devel/binutils LIB_DEPENDS= libgmp.so:math/gmp \ libisl.so:devel/isl \ libmpc.so:math/mpc \ libmpfr.so:math/mpfr RUN_DEPENDS= avr-as:devel/binutils@avr \ avr-ld:devel/binutils@avr USES= bison compiler:c++11-lang cpe gmake iconv libtool localbase \ makeinfo perl5 tar:xz CPE_VENDOR= gnu USE_CXXSTD= gnu++03 USE_LDCONFIG= ${PREFIX}/lib/gcci/avr/${SUFFIX} USE_PERL5= build GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-libssp \ --enable-languages="c c++" \ --target=avr \ --with-gmp=${LOCALBASE} \ --with-isl=${LOCALBASE} \ --without-zstd PLIST_SUB= VERSION=${GCC_VERSION} WITHOUT_CPU_CFLAGS= This is a cross-compiler. CONFLICTS= avr-gcc-devel* INFO= cpp gcc gccint cppinternals gccinstall OPTIONS_DEFINE= NLS OPTIONS_SUB= yes NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls # DIST_VERSION relates to downloads, GCC_VERSION and SUFFIX to names # of executables and directories once installed. A PORTVERSION of # 4.Y.2.s20130808 results in values of 4.Y-20130808, 4.Y.2, and 4Y # for these three. DIST_VERSION= ${PORTVERSION:C/([0-9]+\.[0-9]+).*\.s([0-9]+)/\1-\2/} GCC_VERSION= ${PORTVERSION:C/(.+)\.s[0-9]{8}/\1/} SUFFIX= ${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/} .include .if (${ARCH} == "amd64") ARCH= x86_64 .endif post-patch: @${FIND} ${WRKSRC} -type f \( -name '*.[ch]' -o -name '*.cc' \) | \ ${XARGS} ${EGREP} -l '"(HOST_WIDE|PLUGIN_COND|PRId64)' | \ ${XARGS} ${REINPLACE_CMD} -E -e 's/"(HOST_WIDE|PLUGIN_COND|PRId64)/" \1/g' post-configure: ${MKDIR} ${WRKSRC}/gcc/include post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/gcc/avr/${PORTVERSION}/liblto_plugin.so.0 \ ${STAGEDIR}${PREFIX}/lib/libcc1.so.0.0.0 \ ${STAGEDIR}${PREFIX}/lib/gcc/avr/${PORTVERSION}/plugin/libcc1plugin.so.0.0.0 \ ${STAGEDIR}${PREFIX}/lib/gcc/avr/${PORTVERSION}/plugin/libcp1plugin.so.0.0.0 .include diff --git a/devel/avr-gcc/distinfo b/devel/avr-gcc/distinfo index d6a5928dfab2..4496f6e864cc 100644 --- a/devel/avr-gcc/distinfo +++ b/devel/avr-gcc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1619546014 -SHA256 (gcc-10.2.0.tar.xz) = b8dd4368bb9c7f0b98188317ee0254dd8cc99d1e3a18d0ff146c855fe16c1d8c -SIZE (gcc-10.2.0.tar.xz) = 75004144 +TIMESTAMP = 1644700172 +SHA256 (gcc-10.3.0.tar.xz) = 64f404c1a650f27fc33da242e1f2df54952e3963a49e06e73f6940f3223ac344 +SIZE (gcc-10.3.0.tar.xz) = 76692288 diff --git a/devel/avr-gcc/files/patch-libcpp_lex.c b/devel/avr-gcc/files/patch-libcpp_lex.c deleted file mode 100644 index 05ad28872d11..000000000000 --- a/devel/avr-gcc/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 *