dev-libs/libmspack: remove workaround for parallel make issue

With this commit, a patch was added to fix the parallel make issue.

Package-Manager: Portage-2.3.51, Repoman-2.3.11
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>

diff --git a/dev-libs/libmspack/files/libmspack-0.7.1_alpha-fix-parallel-build.patch b/dev-libs/libmspack/files/libmspack-0.7.1_alpha-fix-parallel-build.patch
new file mode 100644 (file)
index 0000000..38935a8
--- /dev/null
+++ b/dev-libs/libmspack/files/libmspack-0.7.1_alpha-fix-parallel-build.patch
@@ -0,0 +1,20 @@
+From 43099fb1bba26792fe98b4157c950db9c333134d Mon Sep 17 00:00:00 2001
+From: Stuart Caie <kyzer@cabextract.org.uk>
+Date: Tue, 16 Oct 2018 11:25:24 +0100
+Subject: [PATCH] Fix parallel builds by adding adding libmschmd.la explicitly
+ to test_chmd_test_DEPENDENCIES
+
+---
+diff --git a/libmspack/Makefile.am b/libmspack/Makefile.am
+index ba19535..6130bc2 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -89,7 +89,7 @@ test_chmd_order_SOURCES =    test/chmd_order.c test/md5.c test/md5.h \
+ test_chmd_order_LDADD =               libmschmd.la
+ test_chmd_test_SOURCES =      test/chmd_test.c libmschmd.la
+ test_chmd_test_LDADD =                libmschmd.la
+-test_chmd_test_DEPENDENCIES =         test/test_files/chmd/cve-2015-4467-reset-interval-zero.chm
++test_chmd_test_DEPENDENCIES =         libmschmd.la test/test_files/chmd/cve-2015-4467-reset-interval-zero.chm
+ test_chminfo_SOURCES =                test/chminfo.c libmschmd.la
+ test_chminfo_LDADD =          libmschmd.la
+ test_kwajd_test_SOURCES =     test/kwajd_test.c libmspack.la

diff --git a/dev-libs/libmspack/libmspack-0.7.1_alpha.ebuild b/dev-libs/libmspack/libmspack-0.7.1_alpha.ebuild
index 115ef509e1a15eec9a5538ceef417af3c07aa87b..4a10f210590004d4d19377bca1c1704a9d073a43 100644 (file)
--- a/dev-libs/libmspack/libmspack-0.7.1_alpha.ebuild
+++ b/dev-libs/libmspack/libmspack-0.7.1_alpha.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit eutils multilib-minimal
+inherit autotools multilib-minimal
 
 MY_PV="${PV/_alpha/alpha}"
 MY_P="${PN}-${MY_PV}"
@@ -22,18 +22,19 @@ RDEPEND="
        utils? ( !app-arch/mscompress )
 "
 
+PATCHES=( "${FILESDIR}"/${P}-fix-parallel-build.patch )
+
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
        default
 
+       eautoreconf
+
        multilib_copy_sources
 }
 
 multilib_src_configure() {
-       # https://github.com/kyz/libmspack/issues/19
-       export MAKEOPTS=-j1
-
        ECONF_SOURCE="${S}" econf \
                $(use_enable debug) \
                $(use_enable static-libs static)