Gentoo Archives: gentoo-commits

From: Richard Farina <zerochaos@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/dmraid/, sys-fs/dmraid/files/
Date: Wed, 29 Mar 2017 17:19:25
Message-Id: 1490807884.42cb25eec1a7d9fd0efa27c0c40cf1659d1647f4.zerochaos@gentoo
1 commit: 42cb25eec1a7d9fd0efa27c0c40cf1659d1647f4
2 Author: Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
3 AuthorDate: Wed Mar 29 17:18:04 2017 +0000
4 Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
5 CommitDate: Wed Mar 29 17:18:04 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42cb25ee
7
8 sys-fs/dmraid: bug #585886
9
10 Package-Manager: Portage-2.3.5, Repoman-2.3.2
11
12 sys-fs/dmraid/dmraid-1.0.0_rc16-r3.ebuild | 3 ++-
13 sys-fs/dmraid/files/dmraid-1.0.0_rc16-parallel-make.patch | 11 +++++++++++
14 2 files changed, 13 insertions(+), 1 deletion(-)
15
16 diff --git a/sys-fs/dmraid/dmraid-1.0.0_rc16-r3.ebuild b/sys-fs/dmraid/dmraid-1.0.0_rc16-r3.ebuild
17 index 2f5791521df..8c99b3b4831 100644
18 --- a/sys-fs/dmraid/dmraid-1.0.0_rc16-r3.ebuild
19 +++ b/sys-fs/dmraid/dmraid-1.0.0_rc16-r3.ebuild
20 @@ -37,7 +37,8 @@ pkg_setup() {
21 src_prepare() {
22 epatch "${FILESDIR}"/${P}-undo-p-rename.patch \
23 "${FILESDIR}"/${P}-return-all-sets.patch \
24 - "${FILESDIR}"/${P}-static-build-fixes.patch
25 + "${FILESDIR}"/${P}-static-build-fixes.patch \
26 + "${FILESDIR}"/${P}-parallel-make.patch
27 # pkg_check_modules is not in aclocal.m4 by default, and eautoreconf doesnt add it
28 einfo "Appending pkg.m4 from system to aclocal.m4"
29 cat "${ROOT}"/usr/share/aclocal/pkg.m4 >>"${S}"/aclocal.m4 || die "Could not append pkg.m4"
30
31 diff --git a/sys-fs/dmraid/files/dmraid-1.0.0_rc16-parallel-make.patch b/sys-fs/dmraid/files/dmraid-1.0.0_rc16-parallel-make.patch
32 new file mode 100644
33 index 00000000000..8c89374588f
34 --- /dev/null
35 +++ b/sys-fs/dmraid/files/dmraid-1.0.0_rc16-parallel-make.patch
36 @@ -0,0 +1,11 @@
37 +--- dmraid/1.0.0.rc16-3/dmraid/lib/Makefile.in.orig 2016-09-20 12:54:09.416628404 +0200
38 ++++ dmraid/1.0.0.rc16-3/dmraid/lib/Makefile.in 2016-09-20 12:55:06.343698229 +0200
39 +@@ -79,7 +79,7 @@
40 + -Wl,-soname,$(notdir $@).$(DMRAID_LIB_MAJOR) \
41 + $(DEVMAPPEREVENT_LIBS) $(DEVMAPPER_LIBS) $(DL_LIBS) $(LIBS)
42 +
43 +-$(LIB_EVENTS_SHARED): $(OBJECTS2)
44 ++$(LIB_EVENTS_SHARED): $(OBJECTS2) $(LIB_SHARED)
45 + $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(OBJECTS2) \
46 + -shared -Wl,--discard-all -Wl,--no-undefined -Wl,-soname,$(notdir $@) \
47 + $(LIB_SHARED) $(DEVMAPPEREVENT_LIBS) $(DEVMAPPER_LIBS) $(PTHREAD_LIBS) $(LIBS)