From 0cb7d61037747fc1c9d9cc0568a997aa23d57e2e Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Tue, 10 Nov 2015 16:50:30 +0000
Subject: [PATCH] gcc6: update SOURCE_URI with a github clone, plus patches.

---
 ...17.recipe => gcc6-6.0.0_2015_11_08.recipe} |  8 ++---
 .../patches/gcc6-6.0.0_2015_11_08.patchset    | 35 +++++++++++++++++++
 2 files changed, 39 insertions(+), 4 deletions(-)
 rename sys-devel/gcc/{gcc6-6.0.0_2015_07_17.recipe => gcc6-6.0.0_2015_11_08.recipe} (97%)
 create mode 100644 sys-devel/gcc/patches/gcc6-6.0.0_2015_11_08.patchset

diff --git a/sys-devel/gcc/gcc6-6.0.0_2015_07_17.recipe b/sys-devel/gcc/gcc6-6.0.0_2015_11_08.recipe
similarity index 97%
rename from sys-devel/gcc/gcc6-6.0.0_2015_07_17.recipe
rename to sys-devel/gcc/gcc6-6.0.0_2015_11_08.recipe
index efc75804b..47aed4375 100644
--- a/sys-devel/gcc/gcc6-6.0.0_2015_07_17.recipe
+++ b/sys-devel/gcc/gcc6-6.0.0_2015_11_08.recipe
@@ -3,9 +3,9 @@ DESCRIPTION="The standard compiler for non-legacy Haiku (i.e. for all \
 architectures other than x86_gcc2)."
 HOMEPAGE="http://gcc.gnu.org"
 
-srcGitRev="eda37e0caf440798e99bcfd7341e3e172d075244"
-SOURCE_URI="https://github.com/gcc-mirror/gcc/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="ee5f741c96ce7d5ff83eef55cfd93b516265e8c999fa576e19ed26905fc6b6e8"
+srcGitRev="77f839f0466f8b02459719db98bdee6f83ba604b"
+SOURCE_URI="https://github.com/korli/gcc/archive/$srcGitRev.tar.gz"
+CHECKSUM_SHA256="1717c4390f0acc3bb65a9da2339f42171850cb7b90c9346b0715f1d78564cd39"
 REVISION="1"
 LICENSE="
 	GNU GPL v3
@@ -13,7 +13,7 @@ LICENSE="
 	"
 COPYRIGHT="1988-2015 Free Software Foundation, Inc."
 
-PATCHES="gcc6-6.0.0_2015_07_17.patchset"
+PATCHES="gcc6-6.0.0_2015_11_08.patchset"
 
 ARCHITECTURES="!x86_gcc2 !x86 x86_64 arm"
 SECONDARY_ARCHITECTURES="!x86"
diff --git a/sys-devel/gcc/patches/gcc6-6.0.0_2015_11_08.patchset b/sys-devel/gcc/patches/gcc6-6.0.0_2015_11_08.patchset
new file mode 100644
index 000000000..ef14db3cc
--- /dev/null
+++ b/sys-devel/gcc/patches/gcc6-6.0.0_2015_11_08.patchset
@@ -0,0 +1,35 @@
+From 0f079ce672177b678b40d19c28e12f18f9bbbcda Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <jerome.duval@gmail.com>
+Date: Mon, 27 Jul 2015 16:32:32 +0200
+Subject: Haiku: disable -fno-PIE as this fails on x86_64.
+
+
+diff --git a/gcc/Makefile.in b/gcc/Makefile.in
+index 6bac55d..51cb015 100644
+--- a/gcc/Makefile.in
++++ b/gcc/Makefile.in
+@@ -264,7 +264,7 @@ NO_PIE_CFLAGS = @NO_PIE_CFLAGS@
+ NO_PIE_FLAG = @NO_PIE_FLAG@
+ 
+ # We don't want to compile the compilers with -fPIE, it make PCH fail.
+-COMPILER += $(NO_PIE_CFLAGS)
++#COMPILER += $(NO_PIE_CFLAGS)
+ 
+ # Link with -no-pie since we compile the compiler with -fno-PIE.
+ LINKER += $(NO_PIE_FLAG)
+@@ -764,9 +764,9 @@ NO_PIE_CFLAGS_FOR_BUILD = @NO_PIE_CFLAGS_FOR_BUILD@
+ NO_PIE_FLAG_FOR_BUILD = @NO_PIE_FLAG_FOR_BUILD@
+ BUILD_CFLAGS= @BUILD_CFLAGS@ -DGENERATOR_FILE
+ BUILD_CXXFLAGS = @BUILD_CXXFLAGS@ -DGENERATOR_FILE
+-BUILD_NO_PIE_CFLAGS = @BUILD_NO_PIE_CFLAGS@
+-BUILD_CFLAGS += $(BUILD_NO_PIE_CFLAGS)
+-BUILD_CXXFLAGS += $(BUILD_NO_PIE_CFLAGS)
++#BUILD_NO_PIE_CFLAGS = @BUILD_NO_PIE_CFLAGS@
++#BUILD_CFLAGS += $(BUILD_NO_PIE_CFLAGS)
++#BUILD_CXXFLAGS += $(BUILD_NO_PIE_CFLAGS)
+ 
+ # Native compiler that we use.  This may be C++ some day.
+ COMPILER_FOR_BUILD = $(CXX_FOR_BUILD)
+-- 
+2.2.2
+