avr-gcc: Updated ISL dependency to 0.19 for "gcc-graphite" option

[Michael Baeuerle <micha%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By:	micha
Date:		Fri Aug 20 14:16:45 2021 +0200
Changeset:	6054c96bee3f076852b52ca291ab802666b605a1

Modified Files:
	avr-gcc/Makefile
	avr-gcc/TODO
	avr-gcc/distinfo
	avr-gcc/options.mk
Added Files:
	avr-gcc/patches/patch-gcc_configure

Log Message:
avr-gcc: Updated ISL dependency to 0.19 for "gcc-graphite" option

Enabled test target.
First test produced working AVR code.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=6054c96bee3f076852b52ca291ab802666b605a1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 avr-gcc/Makefile                    | 23 ++++++++++++++++++-----
 avr-gcc/TODO                        | 17 ++++++++++++-----
 avr-gcc/distinfo                    |  5 +++++
 avr-gcc/options.mk                  |  6 +++---
 avr-gcc/patches/patch-gcc_configure | 16 ++++++++++++++++
 5 files changed, 54 insertions(+), 13 deletions(-)

diffs:
diff --git a/avr-gcc/Makefile b/avr-gcc/Makefile
index de43cfcf8e..d27e03eb9b 100644
--- a/avr-gcc/Makefile
+++ b/avr-gcc/Makefile
@@ -10,7 +10,10 @@ MAINTAINER=		pkgsrc-users%NetBSD.org@localhost
 COMMENT=		GCC for Atmel AVR 8-bit RISC microcontrollers
 LICENSE=		gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND gnu-lgpl-v3
 
-DEPENDS+=		avr-binutils-[0-9]*:../../cross/avr-binutils
+DISTFILES=		${DEFAULT_DISTFILES}
+EXTRACT_ONLY=		${DEFAULT_DISTFILES}
+
+DEPENDS+=		avr-binutils>=2.37:../../wip/avr-binutils
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -35,6 +38,11 @@ CONFIGURE_ARGS+=	--disable-nls
 CONFIGURE_ARGS+=	--target=avr
 CONFIGURE_ARGS+=	--with-system-zlib
 
+# XXX: Workaround for configure error:
+#    checking dependency style of c++... none
+#    configure: error: no usable dependency style found
+MAKE_ENV+=		am_cv_CXX_dependencies_compiler_type=gcc3
+
 # From lang/gcc10
 MAKE_ENV.NetBSD+=	ac_cv_func_clock_gettime=yes
 MAKE_ENV.NetBSD+=	ac_cv_func_gethostbyname_r=no
@@ -45,22 +53,27 @@ MAKE_ENV.SunOS+=	ac_cv_func_mkostemp=no
 
 INSTALLATION_DIRS+=	avr/bin
 
+TEST_TARGET=		check
+
 .include "options.mk"
 
 # For graphite support.
 .if !empty(PKG_OPTIONS:Mgcc-graphite)
+# CONFIG_SHELL can handle it. Patch will break with this option disabled.
+CHECK_PORTABILITY_SKIP=	isl/configure
+
 post-extract:
-	${TAR} -jxf ${DISTDIR}/${ISL16}.tar.bz2 -C ${WRKSRC}
-	${MV} ${WRKSRC}/${ISL16} ${WRKSRC}/isl
+	${GTAR} -jxf ${DISTDIR}/${ISL19}.tar.bz2 -C ${WRKSRC}
+	${MV} ${WRKSRC}/${ISL19} ${WRKSRC}/isl
 .endif
 
 pre-configure:
 	${RUN} cd ${WRKSRC} && ${MKDIR} ${OBJDIR}
 
 # Remove libcc1 and some manual pages from generic locations
-# All files of this package should not overlap with other GCC packages
+# File paths from this package should not overlap with other GCC packages
 post-install:
-	${RM} -f ${DESTDIR}${PREFIX}/lib/libcc1.a
+	${RM} -f ${DESTDIR}${PREFIX}/lib/libcc1.*
 	${RM} -rf ${DESTDIR}${PREFIX}/${PKGMANDIR}/man7
 
 BUILDLINK_API_DEPENDS.zlib+=	zlib>=1.2.3
diff --git a/avr-gcc/TODO b/avr-gcc/TODO
index f36fa10700..c0b3927901 100644
--- a/avr-gcc/TODO
+++ b/avr-gcc/TODO
@@ -1,5 +1,12 @@
-[ ] Check pkglint warning for libtool
-[ ] Enable test suite
-[ ] Test with real world project
-
-Note: GCC 11.1.0 and 11.2.0 do not work.
+[X] Update package to more recent GCC
+[X] Check pkglint warning for libtool
+    => Added USE_LIBTOOL=yes
+[X] Dependency style of C++ compiler is not detected correctly
+    => Added workaround
+[X] Check package option "gcc-graphite"
+    => Updated ISL to version 0.19
+[X] Check package option "gcc-inplace-math"
+[X] Enable test suite
+    => Does not work with option "gcc-inplace-math"
+[X] Test with real world project
+    => Tested hardware with target ATmega1280
diff --git a/avr-gcc/distinfo b/avr-gcc/distinfo
index 3b18e093ef..141eaf27eb 100644
--- a/avr-gcc/distinfo
+++ b/avr-gcc/distinfo
@@ -4,4 +4,9 @@ SHA1 (gcc-10.3.0.tar.xz) = fb51ed1660c065898c75951fb38e1ebad7d49feb
 RMD160 (gcc-10.3.0.tar.xz) = 8edb715cf1159fd8de773d0d5208d2e83ca36402
 SHA512 (gcc-10.3.0.tar.xz) = 2b2dd7453d48a398c29eaebd1422b70341001b8c90a62aee51e83344e7fdd8a8e45f82a4a9165bd7edc76dada912c932f4b6632c5636760fec4c5d7e402b3f86
 Size (gcc-10.3.0.tar.xz) = 76692288 bytes
+SHA1 (isl-0.19.tar.bz2) = dba7264419ba995a0f6b4fde135993677f7c85fd
+RMD160 (isl-0.19.tar.bz2) = 7b08c99871505194c8795680702c5358ba1bcb05
+SHA512 (isl-0.19.tar.bz2) = 08f4db964d9e02ec8aa9779378ed76e0ddf1d56f81f87664dbf787555ce496cdc87e836f8a51ae137f45e648c604870cce07ee45919eafb549e404afb8f27083
+Size (isl-0.19.tar.bz2) = 1701593 bytes
 SHA1 (patch-contrib_download__prerequisites) = 16d02e5b026ce052b61eced69cfd6a627fea65f5
+SHA1 (patch-gcc_configure) = 613d33d859ec3f108046274d09396aeb344e04cf
diff --git a/avr-gcc/options.mk b/avr-gcc/options.mk
index 334729377a..597c838113 100644
--- a/avr-gcc/options.mk
+++ b/avr-gcc/options.mk
@@ -22,7 +22,7 @@ CONFIGURE_ARGS+=	--with-mpfr=${BUILDLINK_PREFIX.mpfr}
 
 # gcc-graphite: Enable Graphite support
 .if !empty(PKG_OPTIONS:Mgcc-graphite)
-ISL16=			isl-0.16.1
-SITES.${ISL16}.tar.bz2=	${MASTER_SITE_GNU:=gcc/infrastructure/}
-DISTFILES+=		${ISL16}.tar.bz2
+ISL19=			isl-0.19
+SITES.${ISL19}.tar.bz2=	http://isl.gforge.inria.fr/
+DISTFILES+=		${ISL19}.tar.bz2
 .endif
diff --git a/avr-gcc/patches/patch-gcc_configure b/avr-gcc/patches/patch-gcc_configure
new file mode 100644
index 0000000000..a02aa740b1
--- /dev/null
+++ b/avr-gcc/patches/patch-gcc_configure
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Add NetBSD support:
+https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90143
+
+--- gcc/configure.orig	2015-09-30 23:06:11.000000000 +0000
++++ gcc/configure
+@@ -29972,7 +29972,7 @@ case "$target" in
+       gcc_cv_target_dl_iterate_phdr=no
+     fi
+     ;;
+-  *-*-dragonfly* | *-*-freebsd*)
++  *-*-dragonfly* | *-*-freebsd* | *-*-netbsd* )
+     if grep dl_iterate_phdr $target_header_dir/sys/link_elf.h > /dev/null 2>&1; then
+       gcc_cv_target_dl_iterate_phdr=yes
+     else