[gentoo-commits] proj/hardened-dev:musl commit in: sys-devel/gcc/, sys-devel/gcc/files/

["Anthony G. Basile" <blueness@gentoo.org>]

commit:     62ea25d913176e609e6b0ddb21ea07e96bf5de70
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 24 21:52:47 2014 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Oct 24 21:52:47 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=62ea25d9

sys-devel/gcc: fix build USE=gcj, bug #526618

Package-Manager: portage-2.2.8-r2
Manifest-Sign-Key: 0xF52D4BBA

---
 sys-devel/gcc/files/gcc-4.8.3-musl-fix-libc5-assumption.patch | 11 +++++++++++
 sys-devel/gcc/gcc-4.8.3-r99.ebuild                            |  1 +
 2 files changed, 12 insertions(+)

diff --git a/sys-devel/gcc/files/gcc-4.8.3-musl-fix-libc5-assumption.patch b/sys-devel/gcc/files/gcc-4.8.3-musl-fix-libc5-assumption.patch
new file mode 100644
index 0000000..65bc45e
--- /dev/null
+++ b/sys-devel/gcc/files/gcc-4.8.3-musl-fix-libc5-assumption.patch
@@ -0,0 +1,11 @@
+--- /var/tmp/portage/sys-devel/gcc-4.8.3-r99/work/gcc-4.8.3/boehm-gc/os_dep.c	2013-03-06 15:08:58.000000000 +0000
++++ gcc-4.8.3.new/boehm-gc/os_dep.c	2014-10-24 18:25:39.963379871 +0000
+@@ -41,7 +41,7 @@
+ #     else /* not 2 <= __GLIBC__ */
+         /* libc5 doesn't have <sigcontext.h>: go directly with the kernel   */
+         /* one.  Check LINUX_VERSION_CODE to see which we should reference. */
+-#       include <asm/sigcontext.h>
++//#       include <asm/sigcontext.h>
+ #     endif /* 2 <= __GLIBC__ */
+ #   endif
+ # endif

diff --git a/sys-devel/gcc/gcc-4.8.3-r99.ebuild b/sys-devel/gcc/gcc-4.8.3-r99.ebuild
index b96acf6..deb1c76 100644
--- a/sys-devel/gcc/gcc-4.8.3-r99.ebuild
+++ b/sys-devel/gcc/gcc-4.8.3-r99.ebuild
@@ -58,6 +58,7 @@ src_prepare() {
 		cp -r libitm/config/generic libitm/config/linux/x86
 		epatch "${FILESDIR}"/${PN}-4.7.3-musl-linker-path.patch
 		epatch "${FILESDIR}"/${PN}-4.8.3-musl-res_state.patch
+		epatch "${FILESDIR}"/${PN}-4.8.3-musl-fix-libc5-assumption.patch
 	fi
 
 	use vanilla && return 0