avr-gcc: Remove option gcc-graphite

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

Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By:	micha
Date:		Mon Aug 30 13:55:27 2021 +0200
Changeset:	95dd4bdd774bc1ddfaa39fb457087bce9d08ecbe

Modified Files:
	avr-gcc/Makefile
	avr-gcc/TODO
	avr-gcc/options.mk

Log Message:
avr-gcc: Remove option gcc-graphite

Switch ISL to math/isl from pkgsrc.

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

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

diffstat:
 avr-gcc/Makefile   | 10 ----------
 avr-gcc/TODO       |  2 ++
 avr-gcc/options.mk | 14 +++++---------
 3 files changed, 7 insertions(+), 19 deletions(-)

diffs:
diff --git a/avr-gcc/Makefile b/avr-gcc/Makefile
index e78c7f6ce2..f9104826ed 100644
--- a/avr-gcc/Makefile
+++ b/avr-gcc/Makefile
@@ -57,16 +57,6 @@ 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:
-	${GTAR} -jxf ${DISTDIR}/${ISL2X}.tar.bz2 -C ${WRKSRC}
-	${MV} ${WRKSRC}/${ISL2X} ${WRKSRC}/isl
-.endif
-
 pre-configure:
 	${RUN} cd ${WRKSRC} && ${MKDIR} ${OBJDIR}
 
diff --git a/avr-gcc/TODO b/avr-gcc/TODO
index c0b3927901..766bd703b9 100644
--- a/avr-gcc/TODO
+++ b/avr-gcc/TODO
@@ -10,3 +10,5 @@
     => Does not work with option "gcc-inplace-math"
 [X] Test with real world project
     => Tested hardware with target ATmega1280
+[X] Use ISL 0.24 from pkgsrc via bl3 or "inplace.mk"
+    => Remove option gcc-graphite (now always enabled)
diff --git a/avr-gcc/options.mk b/avr-gcc/options.mk
index 57f980ded4..d674914b89 100644
--- a/avr-gcc/options.mk
+++ b/avr-gcc/options.mk
@@ -1,28 +1,24 @@
 # $NetBSD$
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.avr-gcc
-PKG_SUPPORTED_OPTIONS=	gcc-inplace-math gcc-graphite
-PKG_SUGGESTED_OPTIONS=	gcc-graphite
+PKG_SUPPORTED_OPTIONS=	gcc-inplace-math
+PKG_SUGGESTED_OPTIONS=
 
 .include "../../mk/bsd.options.mk"
 
 # gcc-inplace-math: Build math libraries in place
 .if !empty(PKG_OPTIONS:Mgcc-inplace-math)
 .  include "../../devel/gmp/inplace.mk"
+.  include "../../math/isl/inplace.mk"
 .  include "../../math/mpcomplex/inplace.mk"
 .  include "../../math/mpfr/inplace.mk"
 .else
 CONFIGURE_ARGS+=	--with-gmp=${BUILDLINK_PREFIX.gmp}
+CONFIGURE_ARGS+=	--with-isl=${BUILDLINK_PREFIX.isl}
 CONFIGURE_ARGS+=	--with-mpc=${BUILDLINK_PREFIX.mpcomplex}
 CONFIGURE_ARGS+=	--with-mpfr=${BUILDLINK_PREFIX.mpfr}
 .  include "../../devel/gmp/buildlink3.mk"
+.  include "../../math/isl/buildlink3.mk"
 .  include "../../math/mpcomplex/buildlink3.mk"
 .  include "../../math/mpfr/buildlink3.mk"
 .endif
-
-# gcc-graphite: Enable Graphite support
-.if !empty(PKG_OPTIONS:Mgcc-graphite)
-ISL2X=			isl-0.24
-SITES.${ISL2X}.tar.bz2=	http://isl.gforge.inria.fr/
-DISTFILES+=		${ISL2X}.tar.bz2
-.endif