* [gentoo-commits] proj/hardened-dev:musl commit in: dev-libs/boehm-gc/files/, dev-libs/boehm-gc/
@ 2014-02-22 14:27 Anthony G. Basile
0 siblings, 0 replies; 3+ messages in thread
From: Anthony G. Basile @ 2014-02-22 14:27 UTC (permalink / raw
To: gentoo-commits
commit: 89203b22fe179a4f804855b921a05ca1a1b8f7eb
Author: Felix Janda <felix.janda <AT> posteo <DOT> de>
AuthorDate: Sat Feb 22 09:31:09 2014 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Feb 22 14:28:23 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=89203b22
dev-libs/boehm-gc: remove dependence on getcontext
---
dev-libs/boehm-gc/boehm-gc-7.2e-r99.ebuild | 4 +++-
dev-libs/boehm-gc/files/boehm-gc-7.2e-os_dep.patch | 24 ++++++++++------------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/dev-libs/boehm-gc/boehm-gc-7.2e-r99.ebuild b/dev-libs/boehm-gc/boehm-gc-7.2e-r99.ebuild
index 8fa97cb..ef0eaa9 100644
--- a/dev-libs/boehm-gc/boehm-gc-7.2e-r99.ebuild
+++ b/dev-libs/boehm-gc/boehm-gc-7.2e-r99.ebuild
@@ -4,7 +4,7 @@
EAPI=5
-inherit autotools eutils
+inherit autotools eutils flag-o-matic
MY_P="gc-${PV/_/}"
@@ -25,6 +25,8 @@ S="${WORKDIR}/${MY_P/e}"
src_prepare() {
rm -r libatomic_ops || die
+ append-cppflags -DNO_GETCONTEXT
+
epatch "${FILESDIR}"/${P}-automake-1.13.patch
epatch "${FILESDIR}"/${PN}-7.2e-os_dep.patch
eautoreconf
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
index 7e30231..602cfef 100644
--- 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
@@ -1,13 +1,11 @@
---- a/gc-7.2/os_dep.c
-+++ b/gc-7.2/os_dep.c
-@@ -38,10 +38,6 @@
- /* has the right declaration for glibc 2.1. */
- # include <sigcontext.h>
- # endif /* 0 == __GLIBC_MINOR__ */
--# 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>
- # endif /* 2 <= __GLIBC__ */
- # endif
- #endif
+taken from sabotage linux
+--- gc-7.2.org/os_dep.c 2013-01-03 17:13:21.878000003 +0000
++++ gc-7.2/os_dep.c 2013-01-04 07:57:17.766000002 +0000
+@@ -26,6 +26,7 @@
+ # define __KERNEL__
+ # include <asm/signal.h>
+ # undef __KERNEL__
++# elif 1
+ # else
+ /* Kernels prior to 2.1.1 defined struct sigcontext_struct instead of */
+ /* struct sigcontext. libc6 (glibc2) uses "struct sigcontext" in */
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] proj/hardened-dev:musl commit in: dev-libs/boehm-gc/files/, dev-libs/boehm-gc/
@ 2015-04-16 21:18 Anthony G. Basile
0 siblings, 0 replies; 3+ messages in thread
From: Anthony G. Basile @ 2015-04-16 21:18 UTC (permalink / raw
To: gentoo-commits
commit: 12f364eb0045af44b4009a6722f36c560827d20f
Author: Felix Janda <felix.janda <AT> posteo <DOT> de>
AuthorDate: Sat Apr 11 21:27:51 2015 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Apr 16 21:20:36 2015 +0000
URL: https://gitweb.gentoo.org/proj/hardened-dev.git/commit/?id=12f364eb
dev-libs/boehm-gc: musl doesn't have getcontext (yet)
dev-libs/boehm-gc/boehm-gc-7.4.2-r99.ebuild | 3 ++-
dev-libs/boehm-gc/files/boehm-gc-7.4.2-getcontext.patch | 12 ++++++++++++
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/dev-libs/boehm-gc/boehm-gc-7.4.2-r99.ebuild b/dev-libs/boehm-gc/boehm-gc-7.4.2-r99.ebuild
index 2312d58..b46deba 100644
--- a/dev-libs/boehm-gc/boehm-gc-7.4.2-r99.ebuild
+++ b/dev-libs/boehm-gc/boehm-gc-7.4.2-r99.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.hboehm.info/gc/gc_source/${MY_P}.tar.gz"
LICENSE="boehm-gc"
SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ppc ~x86"
+KEYWORDS="amd64 arm ~mips ppc x86"
IUSE="cxx static-libs threads"
DEPEND=">=dev-libs/libatomic_ops-7.4
@@ -24,6 +24,7 @@ S="${WORKDIR}/${MY_P}"
src_prepare() {
epatch "${FILESDIR}"/${PN}-7.2e-os_dep.patch
+ epatch "${FILESDIR}"/${PN}-7.4.2-getcontext.patch
}
src_configure() {
diff --git a/dev-libs/boehm-gc/files/boehm-gc-7.4.2-getcontext.patch b/dev-libs/boehm-gc/files/boehm-gc-7.4.2-getcontext.patch
new file mode 100644
index 0000000..d694b84
--- /dev/null
+++ b/dev-libs/boehm-gc/files/boehm-gc-7.4.2-getcontext.patch
@@ -0,0 +1,12 @@
+diff -ur a/gc-7.4.2/mach_dep.c b/gc-7.4.2/mach_dep.c
+--- a/gc-7.4.2/mach_dep.c 2014-06-03 08:08:02.000000000 -0200
++++ b/gc-7.4.2/mach_dep.c 2015-04-10 10:54:48.500634001 -0200
+@@ -218,7 +218,7 @@
+
+ # if defined(HAVE_PUSH_REGS)
+ GC_push_regs();
+-# elif defined(UNIX_LIKE) && !defined(NO_GETCONTEXT)
++# elif 0
+ /* Older versions of Darwin seem to lack getcontext(). */
+ /* ARM and MIPS Linux often doesn't support a real */
+ /* getcontext(). */
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] proj/hardened-dev:musl commit in: dev-libs/boehm-gc/files/, dev-libs/boehm-gc/
@ 2014-02-17 11:53 Anthony G. Basile
0 siblings, 0 replies; 3+ messages in thread
From: Anthony G. Basile @ 2014-02-17 11:53 UTC (permalink / raw
To: gentoo-commits
commit: 0a5cca545d702d5a9b2606983cf3cd0a496b5e0f
Author: Felix Janda <felix.janda <AT> posteo <DOT> de>
AuthorDate: Sun Feb 16 18:18:09 2014 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Feb 17 11:53:45 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=0a5cca54
dev-libs/boehm-gc: move to tree
---
dev-libs/boehm-gc/boehm-gc-7.2e-r99.ebuild | 59 ++++++++++++++++++++++
.../files/boehm-gc-7.2e-automake-1.13.patch | 13 +++++
dev-libs/boehm-gc/files/boehm-gc-7.2e-os_dep.patch | 13 +++++
dev-libs/boehm-gc/metadata.xml | 12 +++++
4 files changed, 97 insertions(+)
diff --git a/dev-libs/boehm-gc/boehm-gc-7.2e-r99.ebuild b/dev-libs/boehm-gc/boehm-gc-7.2e-r99.ebuild
new file mode 100644
index 0000000..564b63e
--- /dev/null
+++ b/dev-libs/boehm-gc/boehm-gc-7.2e-r99.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boehm-gc/boehm-gc-7.2e.ebuild,v 1.9 2014/01/18 20:05:46 ago Exp $
+
+EAPI=5
+
+inherit autotools eutils
+
+MY_P="gc-${PV/_/}"
+
+DESCRIPTION="The Boehm-Demers-Weiser conservative garbage collector"
+HOMEPAGE="http://www.hpl.hp.com/personal/Hans_Boehm/gc/"
+SRC_URI="http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/${MY_P}.tar.gz"
+
+LICENSE="boehm-gc"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="cxx static-libs threads"
+
+DEPEND=">=dev-libs/libatomic_ops-7.2
+ virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P/e}"
+
+src_prepare() {
+ rm -r libatomic_ops || die
+
+ epatch "${FILESDIR}"/${P}-automake-1.13.patch
+ epatch "${FILESDIR}"/${PN}-7.2e-os_dep.patch
+ eautoreconf
+}
+
+src_configure() {
+ local config=(
+ --with-libatomic-ops
+ $(use_enable cxx cplusplus)
+ $(use_enable static-libs static)
+ $(use threads || echo --disable-threads)
+ )
+ econf "${config[@]}"
+}
+
+src_install() {
+ default
+
+ rm -r "${ED}"/usr/share/gc || die
+
+ # dist_noinst_HEADERS
+ insinto /usr/include/gc
+ doins include/{cord.h,ec.h,javaxfc.h}
+ insinto /usr/include/gc/private
+ doins include/private/*.h
+
+ dodoc README.QUICK doc/README{.environment,.linux,.macros} doc/barrett_diagram
+ dohtml doc/*.html
+ newman doc/gc.man GC_malloc.1
+
+ use static-libs || prune_libtool_files #457872
+}
diff --git a/dev-libs/boehm-gc/files/boehm-gc-7.2e-automake-1.13.patch b/dev-libs/boehm-gc/files/boehm-gc-7.2e-automake-1.13.patch
new file mode 100644
index 0000000..e987c42
--- /dev/null
+++ b/dev-libs/boehm-gc/files/boehm-gc-7.2e-automake-1.13.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index ee6693d..d258252 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -26,7 +26,7 @@ AC_PREREQ(2.64)
+ AC_REVISION($Revision: 1.1 $)
+ GC_SET_VERSION
+ AM_INIT_AUTOMAKE([foreign dist-bzip2 nostdinc])
+-AM_CONFIG_HEADER([include/private/config.h])
++AC_CONFIG_HEADER([include/private/config.h])
+ AM_MAINTAINER_MODE
+
+ AC_SUBST(PACKAGE)
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
new file mode 100644
index 0000000..7e30231
--- /dev/null
+++ b/dev-libs/boehm-gc/files/boehm-gc-7.2e-os_dep.patch
@@ -0,0 +1,13 @@
+--- a/gc-7.2/os_dep.c
++++ b/gc-7.2/os_dep.c
+@@ -38,10 +38,6 @@
+ /* has the right declaration for glibc 2.1. */
+ # include <sigcontext.h>
+ # endif /* 0 == __GLIBC_MINOR__ */
+-# 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>
+ # endif /* 2 <= __GLIBC__ */
+ # endif
+ #endif
diff --git a/dev-libs/boehm-gc/metadata.xml b/dev-libs/boehm-gc/metadata.xml
new file mode 100644
index 0000000..89de980
--- /dev/null
+++ b/dev-libs/boehm-gc/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>sera@gentoo.org</email>
+ <name>Ralph Sennhauser</name>
+ </maintainer>
+ <maintainer>
+ <email>patrick@gentoo.org</email>
+ <name>Patrick Lauer</name>
+ </maintainer>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-04-16 21:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-02-22 14:27 [gentoo-commits] proj/hardened-dev:musl commit in: dev-libs/boehm-gc/files/, dev-libs/boehm-gc/ Anthony G. Basile
-- strict thread matches above, loose matches on Subject: below --
2015-04-16 21:18 Anthony G. Basile
2014-02-17 11:53 Anthony G. Basile
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox