From cc45b19d2341775ea36ec962f09534978e3c135d Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Wed, 4 Nov 2020 10:38:40 +0000
Subject: community/gcc6: rebuild against isl22

---
 community/gcc6/APKBUILD            |  6 ++++--
 community/gcc6/isl-0.22.patch      | 27 +++++++++++++++++++++++++++
 community/java-gcj-compat/APKBUILD |  2 +-
 3 files changed, 32 insertions(+), 3 deletions(-)
 create mode 100644 community/gcc6/isl-0.22.patch

diff --git a/community/gcc6/APKBUILD b/community/gcc6/APKBUILD
index d41524ca28d..f910e3cfee4 100644
--- a/community/gcc6/APKBUILD
+++ b/community/gcc6/APKBUILD
@@ -3,7 +3,7 @@ pkgname=gcc6
 pkgver=6.4.0
 _ver=${pkgver%%.*}
 pkgname="$pkgname"
-pkgrel=11 # Update java-gcj-compat _gccpkgrel so it matchs!
+pkgrel=12 # Update java-gcj-compat _gccpkgrel so it matchs!
 pkgdesc="The GNU Compiler Collection"
 url="https://gcc.gnu.org/"
 arch="all !mips !mips64" # FTBFS on mips
@@ -67,6 +67,7 @@ source="https://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$pkgver}/gcc-${_pkg
 	gcc-pure64-mips.patch
 	fix-ppc64le-coercion-r261621.patch
 	0017-pr93402.patch
+	isl-0.22.patch
 	"
 
 sonameprefix="$pkgname:"
@@ -356,4 +357,5 @@ f4ef08454e28c8732db69115e4998ec153399e8d229dd27f923dbdcf57b68128a65640d026cc7f45
 34a818d5be67eb1f34e44a80b83c28a9b9c17d37fc9fac639f490d6bb5b53ebe3318140d09c236a17d7c98f5a7792ae3d6cefccda8067a5e942d6305b9d1f87c  fix-linux-header-use-in-libgcc.patch
 86be3338cc9c33089608bc4c5e3b7918c4e500a345c338f361b18c342119a6ed69af5495d72950de7106d760f003528b46ad14795e805f8a3331e206dcb234e3  gcc-pure64-mips.patch
 aae9d510326bed6eca0b1f680d2caf64dd804e73fb9d726c8932faa845c07e1be6ab12920972d8fb80a33dafedcaafca71487b0eaf10e6d5fa7deb853926b933  fix-ppc64le-coercion-r261621.patch
-0e20a5717c20ddc1d9f00276453b0abb4868adff0496604ad7d5b766a1028181c09c2061c5648bcfd4cb29dca7048cc866d2f27c013d82c2440164f17eac685d  0017-pr93402.patch"
+0e20a5717c20ddc1d9f00276453b0abb4868adff0496604ad7d5b766a1028181c09c2061c5648bcfd4cb29dca7048cc866d2f27c013d82c2440164f17eac685d  0017-pr93402.patch
+8c46436ca6ff75d68186e6aeeb16addee7bf2502c4295b86f71ab3dc9d58540cc5cf8723bee69b3aeae07cde0c725a19fbe69c1110a23549331b5b0b250fd31f  isl-0.22.patch"
diff --git a/community/gcc6/isl-0.22.patch b/community/gcc6/isl-0.22.patch
new file mode 100644
index 00000000000..7fe5693c471
--- /dev/null
+++ b/community/gcc6/isl-0.22.patch
@@ -0,0 +1,27 @@
+From 9b4e3b9a661e6316b0fe2a966347fc8e9c39d552 Mon Sep 17 00:00:00 2001
+From: Alexey Neyman <stilor@att.net>
+Date: Wed, 26 Sep 2018 14:09:03 +0000
+Subject: [PATCH] graphite.h: Include <isl/id.h> and <isl/space.h>...
+
+	* graphite.h: Include <isl/id.h> and <isl/space.h>; these
+	headers are no longer pulled in by <isl/val.h>.
+
+From-SVN: r264642
+---
+ gcc/ChangeLog  | 5 +++++
+ gcc/graphite.h | 2 ++
+ 2 files changed, 7 insertions(+)
+
+diff --git a/gcc/graphite.h b/gcc/graphite.h
+index be0a22b38942..8db5700e03f1 100644
+--- a/gcc/graphite.h
++++ b/gcc/graphite.h
+@@ -26,6 +26,8 @@ along with GCC; see the file COPYING3.  If not see
+ #include <isl/options.h>
+ #include <isl/ctx.h>
+ #include <isl/val.h>
++#include <isl/id.h>
++#include <isl/space.h>
+ #include <isl/set.h>
+ #include <isl/union_set.h>
+ #include <isl/map.h>
diff --git a/community/java-gcj-compat/APKBUILD b/community/java-gcj-compat/APKBUILD
index 25db53e4a4d..bec54e3562d 100644
--- a/community/java-gcj-compat/APKBUILD
+++ b/community/java-gcj-compat/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Timo Teras <timo.teras@iki.fi>
 
 _gccver=6.4.0
-_gccpkgrel=11
+_gccpkgrel=12
 
 pkgname=java-gcj-compat
 pkgver=$_gccver
-- 
cgit v1.2.3