From e20cd7bde5a0cceb81e213e03470d6907f96093a Mon Sep 17 00:00:00 2001
From: Jonathan Perkin <jperkin@joyent.com>
Date: Fri, 26 Jun 2015 16:22:19 +0100
Subject: [PATCH] lang/gcc47: fix joyent/pkgsrc#264 and joyent/pkgsrc#270

---
 lang/gcc47/distinfo                      |  4 ++--
 lang/gcc47/patches/patch-gcc_Makefile.in | 15 +++++++++++++--
 lang/gcc47/patches/patch-gcc_configure   | 15 +++++++++++++--
 3 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/lang/gcc47/distinfo b/lang/gcc47/distinfo
index 7851e5984eb23..7aaf96f7714fb 100644
--- a/lang/gcc47/distinfo
+++ b/lang/gcc47/distinfo
@@ -7,7 +7,7 @@ SHA1 (gcc-4.7.4.tar.bz2) = f3359a157b3536f289c155363f1736a2c9b414db
 RMD160 (gcc-4.7.4.tar.bz2) = d0a8e421b9c62a923f765b97828b12d5af388199
 Size (gcc-4.7.4.tar.bz2) = 82935453 bytes
 SHA1 (patch-configure) = 51c0978c60baddd90ef7e512445fdef913c04e6c
-SHA1 (patch-gcc_Makefile.in) = a61187af64943ef38088442397fcd0f3f65fe2b5
+SHA1 (patch-gcc_Makefile.in) = ab307ae9f48bd05b4fafca5c618588ef3d37408d
 SHA1 (patch-gcc_caller-save.c) = 85d985d1fd9736908be6e99028aa5fe7dcadca59
 SHA1 (patch-gcc_common.opt) = 0f1212c9f9ab4a73e4ac6d56ebffbb89477f1e31
 SHA1 (patch-gcc_config.gcc) = efa4ecabd71bdec14d5dd1f8bb836116c7a9d6e9
@@ -18,7 +18,7 @@ SHA1 (patch-gcc_config_i386_dragonfly.h) = 0d3f785434c02beb9c4561fe59842a970e8f7
 SHA1 (patch-gcc_config_i386_i386.c) = 7b452589ae5deb228236529166bf096fda40718a
 SHA1 (patch-gcc_config_netbsd-stdint.h) = 025fc883101a187e84ed4c0772406720d645d550
 SHA1 (patch-gcc_config_sol2.h) = 4f6ffe871840dcf7e2e469fdcc5d327b9b00f957
-SHA1 (patch-gcc_configure) = a4b670d0c54c410d38715b7a2a572a7048e3ec5e
+SHA1 (patch-gcc_configure) = 01464863f31087390d612023a849e9c8f626b751
 SHA1 (patch-gcc_dojump.c) = 6a095ae23d0ed0469dbcf746bcbefc3f33613482
 SHA1 (patch-gcc_fortran_f95-lang.c) = 6edd2adc7de0d6db36fc5670535b55f61664f5fd
 SHA1 (patch-gcc_gcc.c) = d28e633c8961161562db960054aaa5aa6a1ac645
diff --git a/lang/gcc47/patches/patch-gcc_Makefile.in b/lang/gcc47/patches/patch-gcc_Makefile.in
index 009480faaf651..dff54a499cedd 100644
--- a/lang/gcc47/patches/patch-gcc_Makefile.in
+++ b/lang/gcc47/patches/patch-gcc_Makefile.in
@@ -5,9 +5,11 @@ are found.
 
 NOTE: the %M spec string is added by patch-gcc_gcc.c
 
---- gcc/Makefile.in.orig	2012-03-07 10:59:56.000000000 +0000
+Disable fixincludes, as per joyent/pkgsrc#270
+
+--- gcc/Makefile.in.orig	2013-07-08 09:15:35.000000000 +0000
 +++ gcc/Makefile.in
-@@ -2074,6 +2074,7 @@ prefix.o: prefix.c $(CONFIG_H) $(SYSTEM_
+@@ -2090,6 +2090,7 @@ prefix.o: prefix.c $(CONFIG_H) $(SYSTEM_
  # Language-independent files.
  
  DRIVER_DEFINES = \
@@ -15,3 +17,12 @@ NOTE: the %M spec string is added by patch-gcc_gcc.c
    -DSTANDARD_STARTFILE_PREFIX=\"$(unlibsubdir)/\" \
    -DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc/\" \
    -DSTANDARD_LIBEXEC_PREFIX=\"$(libexecdir)/gcc/\" \
+@@ -4204,7 +4205,7 @@ stmp-fixinc: gsyslimits.h macro_list fix
+ 	      gcc_dir=`${PWD_COMMAND}` ; \
+ 	      export TARGET_MACHINE srcdir SHELL MACRO_LIST && \
+ 	      cd $(build_objdir)/fixincludes && \
+-	      $(SHELL) ./fixinc.sh "$${gcc_dir}/$${fix_dir}" \
++	      $(SHELL) -c true "$${gcc_dir}/$${fix_dir}" \
+ 	        $(SYSTEM_HEADER_DIR) $(OTHER_FIXINCLUDES_DIRS) ); \
+ 	    rm -f $${fix_dir}/syslimits.h; \
+ 	    if [ -f $${fix_dir}/limits.h ]; then \
diff --git a/lang/gcc47/patches/patch-gcc_configure b/lang/gcc47/patches/patch-gcc_configure
index 0ef815b01544c..0ebb79d222b6e 100644
--- a/lang/gcc47/patches/patch-gcc_configure
+++ b/lang/gcc47/patches/patch-gcc_configure
@@ -4,9 +4,20 @@ Add dl_iterate_phdr detection for FreeBSD and DragonFly.
 Detection for NetBSD and OpenBSD is added but commented out in case this
 error handling mechanism is activated for these platforms later.
 
---- gcc/configure.orig	2012-03-08 13:54:54.000000000 +0000
+Fix detection of native TLS on SunOS, joyent/pkgsrc#264
+
+--- gcc/configure.orig	2014-02-12 16:43:47.000000000 +0000
 +++ gcc/configure
-@@ -26802,6 +26802,20 @@ case "$target" in
+@@ -23374,7 +23374,7 @@ $as_echo "#define TLS_SECTION_ASM_FLAG '
+ 	.section ".tdata","awT",@progbits'
+       tls_first_major=2
+       tls_first_minor=14
+-      tls_as_opt="--fatal-warnings"
++      tls_as_opt="-32 --fatal-warnings"
+     fi
+     conftest_s="$conftest_s
+ foo:	.long	25
+@@ -26906,6 +26906,20 @@ case "$target" in
        gcc_cv_target_dl_iterate_phdr=no
      fi
      ;;