[gentoo-commits] repo/gentoo:master commit in: sys-fs/dmraid/, sys-fs/dmraid/files/

[Richard Farina]

commit:     42cb25eec1a7d9fd0efa27c0c40cf1659d1647f4
Author:     Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 29 17:18:04 2017 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Wed Mar 29 17:18:04 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42cb25ee

sys-fs/dmraid: bug #585886

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 sys-fs/dmraid/dmraid-1.0.0_rc16-r3.ebuild                 |  3 ++-
 sys-fs/dmraid/files/dmraid-1.0.0_rc16-parallel-make.patch | 11 +++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/sys-fs/dmraid/dmraid-1.0.0_rc16-r3.ebuild 
b/sys-fs/dmraid/dmraid-1.0.0_rc16-r3.ebuild
index 2f5791521df..8c99b3b4831 100644
--- a/sys-fs/dmraid/dmraid-1.0.0_rc16-r3.ebuild
+++ b/sys-fs/dmraid/dmraid-1.0.0_rc16-r3.ebuild
@@ -37,7 +37,8 @@ pkg_setup() {
 src_prepare() {
        epatch  "${FILESDIR}"/${P}-undo-p-rename.patch \
                "${FILESDIR}"/${P}-return-all-sets.patch \
-               "${FILESDIR}"/${P}-static-build-fixes.patch
+               "${FILESDIR}"/${P}-static-build-fixes.patch \
+               "${FILESDIR}"/${P}-parallel-make.patch
        # pkg_check_modules is not in aclocal.m4 by default, and eautoreconf 
doesnt add it
        einfo "Appending pkg.m4 from system to aclocal.m4"
        cat "${ROOT}"/usr/share/aclocal/pkg.m4 >>"${S}"/aclocal.m4 || die 
"Could not append pkg.m4"

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
new file mode 100644
index 00000000000..8c89374588f
--- /dev/null
+++ b/sys-fs/dmraid/files/dmraid-1.0.0_rc16-parallel-make.patch
@@ -0,0 +1,11 @@
+--- dmraid/1.0.0.rc16-3/dmraid/lib/Makefile.in.orig    2016-09-20 
12:54:09.416628404 +0200
++++ dmraid/1.0.0.rc16-3/dmraid/lib/Makefile.in 2016-09-20 12:55:06.343698229 
+0200
+@@ -79,7 +79,7 @@
+               -Wl,-soname,$(notdir $@).$(DMRAID_LIB_MAJOR) \
+               $(DEVMAPPEREVENT_LIBS) $(DEVMAPPER_LIBS) $(DL_LIBS) $(LIBS)
+ 
+-$(LIB_EVENTS_SHARED): $(OBJECTS2)
++$(LIB_EVENTS_SHARED): $(OBJECTS2) $(LIB_SHARED)
+       $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(OBJECTS2) \
+               -shared -Wl,--discard-all -Wl,--no-undefined 
-Wl,-soname,$(notdir $@) \
+               $(LIB_SHARED) $(DEVMAPPEREVENT_LIBS) $(DEVMAPPER_LIBS) 
$(PTHREAD_LIBS) $(LIBS)