From 64e107b9b6058580ff0432107eb37cefb0b2a7d8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 22 Oct 2018 11:09:47 +0100 Subject: gentoo resync : 22.10.2018 --- dev-libs/libmspack/Manifest | 5 +++-- .../libmspack-0.7.1_alpha-fix-parallel-build.patch | 20 ++++++++++++++++++++ dev-libs/libmspack/libmspack-0.6_alpha.ebuild | 2 +- dev-libs/libmspack/libmspack-0.7.1_alpha.ebuild | 11 ++++++----- 4 files changed, 30 insertions(+), 8 deletions(-) create mode 100644 dev-libs/libmspack/files/libmspack-0.7.1_alpha-fix-parallel-build.patch (limited to 'dev-libs/libmspack') diff --git a/dev-libs/libmspack/Manifest b/dev-libs/libmspack/Manifest index 39429f503b13..945adb0a35ec 100644 --- a/dev-libs/libmspack/Manifest +++ b/dev-libs/libmspack/Manifest @@ -1,6 +1,7 @@ AUX libmspack-0.6_alpha-fix-tests.patch 575 BLAKE2B 35a8342f103926bfff555237cbd432fd679ab61620aeaf654041cfb6c39a18f3be475bf7e0a93c004d7c953d6f2ed66e4528d3b546e9d22b28e1e666c6d9caeb SHA512 8c715e174d3eca76fb33c2a5eccccd4f7c4c7702320d0db9db5dec6038129f508afade126ae791191ffaaf60740a722db7a87fc76f8c00c86912a1e2e2323eda +AUX libmspack-0.7.1_alpha-fix-parallel-build.patch 954 BLAKE2B 545d90548a32c296d6bcbcd9e880574ba76bbb2d06a0ed41446b1632e8fdcf32c61dbdb6455cf9d9080d49840a1739983f9746614be0f08532c4db70ab16cf0e SHA512 251d7dd86f44f06bea8b1589b860e126e849743c4433703b4420da85737373af4b52c3f55dd8dab94e3bfb4a5e9626eee341f19f1ad649573727b7613170f2ef DIST libmspack-0.6alpha.tar.gz 476992 BLAKE2B 3ff510e108e12741b661a4960f204ce268572f79917d4ec18e105d09cee3f515d76e02a2432717ad6c2118c7eb191b51902ce86e3c5b441ee269740816b2a392 SHA512 7ba4a584d335c2d703628a3c179bc0d323574632357cdfe04622f960dcc4ef970b5739799397b6802d44a312f7ed9d589b4be223facf044bbfdbfd76d9c7405d DIST libmspack-0.7.1alpha.tar.gz 486840 BLAKE2B f97abba7b261cced6e5c500c50243920c44ae8bc245e54386c4568e17989f2bad2c3316d83ebbd75220b50b09ed4ded156965e9aa430bd207aaa6b7c6218d800 SHA512 e903629a34c29099a261a108e4eb9cda485ab999bbc3383e3cd6a39715077d00b26a1c641b0f3df0eef60d2e15a7ef623379df0cfe25b99d4eda080529ffec7b -EBUILD libmspack-0.6_alpha.ebuild 1179 BLAKE2B 26b87e8a8c53c60a7f7d75aa8f294c0edaa89afed3e2ded99c97700e3d5ec0154c7610883c9b0f504076389033ae6edad381b13ef40e465ec1da7bda6e4d9335 SHA512 ec70ba20463026e7a918908484fc114d78ca572ad276ed0e9cc77087977b58afd5be9ab8d384df58810c2801c32d1096de36d217d9656d64bc82c33eb34d255b -EBUILD libmspack-0.7.1_alpha.ebuild 1347 BLAKE2B ffaa1c2516bcd34312195cd5f3345c5c201c9e701a2cfadc68c6dcde8730eb8da694d85fdc869367f1316273fcf8eafdcbee5b52dfff82f75b68a1d2f39110f8 SHA512 74f9481d5e94c72ad769a97e3a0f98bac1f6253a909e20221c1588f9d2a49829d499b2d71aec155054076580400250e2697e2bcbc0e732104fdebc2f160c0dbe +EBUILD libmspack-0.6_alpha.ebuild 1185 BLAKE2B decc95044aeab67c2031bccf940a2c00f71263b4321d58e58ad8753aae67578b37d75964bad79457943be49e821d99c8d7bef56dcff383f02a23483c633adb97 SHA512 47ea82678d2701d15391697a498c8099b88742c82772bb79270d0c5138ea1061e5112a3609cfa4724517ce13790084e680deb385d48cc065bb9abd508ad6a50f +EBUILD libmspack-0.7.1_alpha.ebuild 1350 BLAKE2B 2547d6a0d39530f7e019ea0073cd809c563094fc4ae8198f7b0c27c29d714b34c8f5f2a308d6a8df3a3cd5c847715e97a3d154483a90c3314e32a9761d0a3d4c SHA512 c4bd1afc5c42640541b70140295a860412beabfc7f90407acc2dc7263f711531bd3cd00b4f1280841a2fd556c7e4e32d554519e5a54ea258f5e24b963d08a274 MISC metadata.xml 355 BLAKE2B 27dbf410ad5287ffc5ec6336a0c4cfc8eb02b52d72c9cceaaf39518dd435fc647e5c667f003c2b00141bd076fb574e6914f8cd3ad37de693bccfef9942e46689 SHA512 08390d344d23931d0c418eb18e0db2dbaba1f9942fac4984786fab7fa15045a9ccded1acc98d8ff4fdb4a2d5d83cb68383818745cb06b1b743489a2efaeb69d1 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 index 000000000000..38935a8d26f4 --- /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 +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.6_alpha.ebuild b/dev-libs/libmspack/libmspack-0.6_alpha.ebuild index 645770312919..dbb66269d83f 100644 --- a/dev-libs/libmspack/libmspack-0.6_alpha.ebuild +++ b/dev-libs/libmspack/libmspack-0.6_alpha.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://www.cabextract.org.uk/libmspack/libmspack-${MY_PV}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="amd64 ~arm hppa ia64 ~ppc ppc64 ~sparc x86" +KEYWORDS="alpha amd64 ~arm hppa ia64 ~ppc ppc64 ~sparc x86" IUSE="debug doc static-libs utils" DEPEND="" diff --git a/dev-libs/libmspack/libmspack-0.7.1_alpha.ebuild b/dev-libs/libmspack/libmspack-0.7.1_alpha.ebuild index a75ec2a107d3..4a10f2105900 100644 --- 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}" @@ -14,7 +14,7 @@ SRC_URI="https://www.cabextract.org.uk/libmspack/libmspack-${MY_PV}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc x86" +KEYWORDS="amd64 ~arm hppa ia64 ~ppc ppc64 ~sparc x86" IUSE="debug doc static-libs utils" DEPEND="" @@ -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) -- cgit v1.2.3