Gentoo Archives: gentoo-commits

From: "Anthony G. Basile" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/hardened-dev:musl commit in: dev-libs/boehm-gc/files/, dev-libs/boehm-gc/
Date: Sat, 22 Feb 2014 14:27:35
Message-Id: 1393079303.89203b22fe179a4f804855b921a05ca1a1b8f7eb.blueness@gentoo
1 commit: 89203b22fe179a4f804855b921a05ca1a1b8f7eb
2 Author: Felix Janda <felix.janda <AT> posteo <DOT> de>
3 AuthorDate: Sat Feb 22 09:31:09 2014 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Sat Feb 22 14:28:23 2014 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=89203b22
7
8 dev-libs/boehm-gc: remove dependence on getcontext
9
10 ---
11 dev-libs/boehm-gc/boehm-gc-7.2e-r99.ebuild | 4 +++-
12 dev-libs/boehm-gc/files/boehm-gc-7.2e-os_dep.patch | 24 ++++++++++------------
13 2 files changed, 14 insertions(+), 14 deletions(-)
14
15 diff --git a/dev-libs/boehm-gc/boehm-gc-7.2e-r99.ebuild b/dev-libs/boehm-gc/boehm-gc-7.2e-r99.ebuild
16 index 8fa97cb..ef0eaa9 100644
17 --- a/dev-libs/boehm-gc/boehm-gc-7.2e-r99.ebuild
18 +++ b/dev-libs/boehm-gc/boehm-gc-7.2e-r99.ebuild
19 @@ -4,7 +4,7 @@
20
21 EAPI=5
22
23 -inherit autotools eutils
24 +inherit autotools eutils flag-o-matic
25
26 MY_P="gc-${PV/_/}"
27
28 @@ -25,6 +25,8 @@ S="${WORKDIR}/${MY_P/e}"
29 src_prepare() {
30 rm -r libatomic_ops || die
31
32 + append-cppflags -DNO_GETCONTEXT
33 +
34 epatch "${FILESDIR}"/${P}-automake-1.13.patch
35 epatch "${FILESDIR}"/${PN}-7.2e-os_dep.patch
36 eautoreconf
37
38 diff --git a/dev-libs/boehm-gc/files/boehm-gc-7.2e-os_dep.patch b/dev-libs/boehm-gc/files/boehm-gc-7.2e-os_dep.patch
39 index 7e30231..602cfef 100644
40 --- a/dev-libs/boehm-gc/files/boehm-gc-7.2e-os_dep.patch
41 +++ b/dev-libs/boehm-gc/files/boehm-gc-7.2e-os_dep.patch
42 @@ -1,13 +1,11 @@
43 ---- a/gc-7.2/os_dep.c
44 -+++ b/gc-7.2/os_dep.c
45 -@@ -38,10 +38,6 @@
46 - /* has the right declaration for glibc 2.1. */
47 - # include <sigcontext.h>
48 - # endif /* 0 == __GLIBC_MINOR__ */
49 --# else /* not 2 <= __GLIBC__ */
50 -- /* libc5 doesn't have <sigcontext.h>: go directly with the kernel */
51 -- /* one. Check LINUX_VERSION_CODE to see which we should reference. */
52 --# include <asm/sigcontext.h>
53 - # endif /* 2 <= __GLIBC__ */
54 - # endif
55 - #endif
56 +taken from sabotage linux
57 +--- gc-7.2.org/os_dep.c 2013-01-03 17:13:21.878000003 +0000
58 ++++ gc-7.2/os_dep.c 2013-01-04 07:57:17.766000002 +0000
59 +@@ -26,6 +26,7 @@
60 + # define __KERNEL__
61 + # include <asm/signal.h>
62 + # undef __KERNEL__
63 ++# elif 1
64 + # else
65 + /* Kernels prior to 2.1.1 defined struct sigcontext_struct instead of */
66 + /* struct sigcontext. libc6 (glibc2) uses "struct sigcontext" in */