| 1 |
commit: dadf36167d14bbbd8e5b5d5ac5da9537443a51f0 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Nov 3 21:27:45 2015 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Nov 3 21:55:33 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dadf3616 |
| 7 |
|
| 8 |
app-arch/lz4: Version bump to r131 |
| 9 |
|
| 10 |
Bump to upstream revision 131. Fix the build procedure following |
| 11 |
Makefile changes. Bump subslot to current revision since upstream |
| 12 |
changed ABI without bumping SONAME. |
| 13 |
|
| 14 |
Fixes: https://bugs.gentoo.org/show_bug.cgi?id=522860 |
| 15 |
|
| 16 |
app-arch/lz4/Manifest | 1 + |
| 17 |
.../lz4/{lz4-9999.ebuild => lz4-0_p131.ebuild} | 26 +++++++++++++++------- |
| 18 |
app-arch/lz4/lz4-9999.ebuild | 24 ++++++++++++++------ |
| 19 |
3 files changed, 36 insertions(+), 15 deletions(-) |
| 20 |
|
| 21 |
diff --git a/app-arch/lz4/Manifest b/app-arch/lz4/Manifest |
| 22 |
index 87be5e2..6cf7fa7 100644 |
| 23 |
--- a/app-arch/lz4/Manifest |
| 24 |
+++ b/app-arch/lz4/Manifest |
| 25 |
@@ -1,2 +1,3 @@ |
| 26 |
DIST lz4-0_p106.tar.xz 129352 SHA256 a9a09c4ebb962995d10e7e4f7d9224aaa93f308899de18a414948a58e87b6f22 SHA512 8b2bafbf78be7c42831e264d7acdca12712c88369cecdb3aa4621c84bb6b450c372f5153f7c3939a5f70d5810c62b98993697397319d286a1bb51b1e4a6ecde6 WHIRLPOOL fc5bb47b73606b125d8e155365d1fe101083e68e684ffd6014440e0f1416f1f6ecc64b797083e6939bd3e8cd42018e46a1864ae4542160c96933a47df9421a42 |
| 27 |
DIST lz4-r120.tar.gz 161950 SHA256 fa02b1bcc26529c27cff0883d830914bdd1ba41a87035313e1050302f17e4b07 SHA512 8b27c57737ba4c2c8e4f00f7ce13f6edc91f74885bad66dd521dfe85d427e0fd78a300896d599bb8642a34fba78446daf207d1b2fd8e91543d4c093e53694e86 WHIRLPOOL 6a0cd7f8caf9799130b13b3f282197b5ef20fb987f0f5f6911f71a0f5d5d37c542976be5f13bdd2e21a8edd0a6cc8408fcc0f69f6354a0fbc7df75b22fb9de91 |
| 28 |
+DIST lz4-r131.tar.gz 133784 SHA256 9d4d00614d6b9dec3114b33d1224b6262b99ace24434c53487a0c8fd0b18cfed SHA512 60bd95d529691ffee2c43f0d8a62484c3cff74c0154094f073192606806ac8182dced61e0534ffa7e0ccf5f18e9a8cfd2738883a83814c0711a6d7f1d1b252e5 WHIRLPOOL d605dbada1d4eb84eb6f3f45417eaa35433b1e3e875af560bb5fa06f0465f1652fab74c094d0d743e0034abc0067c83114827e21baea69d5c3d6d95062d0f660 |
| 29 |
|
| 30 |
diff --git a/app-arch/lz4/lz4-9999.ebuild b/app-arch/lz4/lz4-0_p131.ebuild |
| 31 |
similarity index 53% |
| 32 |
copy from app-arch/lz4/lz4-9999.ebuild |
| 33 |
copy to app-arch/lz4/lz4-0_p131.ebuild |
| 34 |
index 7da32ea..fac9230 100644 |
| 35 |
--- a/app-arch/lz4/lz4-9999.ebuild |
| 36 |
+++ b/app-arch/lz4/lz4-0_p131.ebuild |
| 37 |
@@ -1,4 +1,4 @@ |
| 38 |
-# Copyright 1999-2014 Gentoo Foundation |
| 39 |
+# Copyright 1999-2015 Gentoo Foundation |
| 40 |
# Distributed under the terms of the GNU General Public License v2 |
| 41 |
# $Id$ |
| 42 |
|
| 43 |
@@ -11,21 +11,29 @@ if [[ ${PV} == 9999 ]]; then |
| 44 |
EGIT_REPO_URI="https://github.com/Cyan4973/lz4.git" |
| 45 |
EGIT_BRANCH=dev |
| 46 |
else |
| 47 |
- SRC_URI="https://dev.gentoo.org/~ryao/dist/${P}.tar.xz" |
| 48 |
+ MY_PV="r${PV##0_p}" |
| 49 |
+ MY_P="${PN}-${MY_PV}" |
| 50 |
+ SRC_URI="https://github.com/Cyan4973/lz4/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz" |
| 51 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" |
| 52 |
+ S="${WORKDIR}/${MY_P}" |
| 53 |
fi |
| 54 |
|
| 55 |
DESCRIPTION="Extremely Fast Compression algorithm" |
| 56 |
HOMEPAGE="https://github.com/Cyan4973/lz4" |
| 57 |
|
| 58 |
LICENSE="BSD-2 GPL-2" |
| 59 |
-SLOT="0" |
| 60 |
-IUSE="test" |
| 61 |
+# Upstream has trouble keeping ABI stable, so please test new versions |
| 62 |
+# with abi-compliance-checker and update the subslot every time ABI |
| 63 |
+# changes. This is the least we can do to keep things sane. |
| 64 |
+SLOT="0/r131" |
| 65 |
+IUSE="test valgrind" |
| 66 |
|
| 67 |
-RDEPEND="" |
| 68 |
-DEPEND="test? ( dev-util/valgrind )" |
| 69 |
+DEPEND="test? ( valgrind? ( dev-util/valgrind ) )" |
| 70 |
|
| 71 |
src_prepare() { |
| 72 |
+ if ! use valgrind; then |
| 73 |
+ sed -i -e '/^test:/s|test-mem||g' programs/Makefile || die |
| 74 |
+ fi |
| 75 |
multilib_copy_sources |
| 76 |
} |
| 77 |
|
| 78 |
@@ -33,8 +41,10 @@ multilib_src_compile() { |
| 79 |
tc-export CC AR |
| 80 |
# we must not use the 'all' target since it builds test programs |
| 81 |
# & extra -m32 executables |
| 82 |
- emake |
| 83 |
- emake -C programs |
| 84 |
+ emake -C lib liblz4 liblz4.pc |
| 85 |
+ emake -C programs lz4 lz4c |
| 86 |
+ # work around lack of proper target dependencies |
| 87 |
+ touch lib/liblz4 |
| 88 |
} |
| 89 |
|
| 90 |
multilib_src_install() { |
| 91 |
|
| 92 |
diff --git a/app-arch/lz4/lz4-9999.ebuild b/app-arch/lz4/lz4-9999.ebuild |
| 93 |
index 7da32ea..277023b 100644 |
| 94 |
--- a/app-arch/lz4/lz4-9999.ebuild |
| 95 |
+++ b/app-arch/lz4/lz4-9999.ebuild |
| 96 |
@@ -11,21 +11,29 @@ if [[ ${PV} == 9999 ]]; then |
| 97 |
EGIT_REPO_URI="https://github.com/Cyan4973/lz4.git" |
| 98 |
EGIT_BRANCH=dev |
| 99 |
else |
| 100 |
- SRC_URI="https://dev.gentoo.org/~ryao/dist/${P}.tar.xz" |
| 101 |
+ MY_PV="r${PV##0_p}" |
| 102 |
+ MY_P="${PN}-${MY_PV}" |
| 103 |
+ SRC_URI="https://github.com/Cyan4973/lz4/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz" |
| 104 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" |
| 105 |
+ S="${WORKDIR}/${MY_P}" |
| 106 |
fi |
| 107 |
|
| 108 |
DESCRIPTION="Extremely Fast Compression algorithm" |
| 109 |
HOMEPAGE="https://github.com/Cyan4973/lz4" |
| 110 |
|
| 111 |
LICENSE="BSD-2 GPL-2" |
| 112 |
-SLOT="0" |
| 113 |
-IUSE="test" |
| 114 |
+# Upstream has trouble keeping ABI stable, so please test new versions |
| 115 |
+# with abi-compliance-checker and update the subslot every time ABI |
| 116 |
+# changes. This is the least we can do to keep things sane. |
| 117 |
+SLOT="0/r131" |
| 118 |
+IUSE="test valgrind" |
| 119 |
|
| 120 |
-RDEPEND="" |
| 121 |
-DEPEND="test? ( dev-util/valgrind )" |
| 122 |
+DEPEND="test? ( valgrind? ( dev-util/valgrind ) )" |
| 123 |
|
| 124 |
src_prepare() { |
| 125 |
+ if ! use valgrind; then |
| 126 |
+ sed -i -e '/^test:/s|test-mem||g' programs/Makefile || die |
| 127 |
+ fi |
| 128 |
multilib_copy_sources |
| 129 |
} |
| 130 |
|
| 131 |
@@ -33,8 +41,10 @@ multilib_src_compile() { |
| 132 |
tc-export CC AR |
| 133 |
# we must not use the 'all' target since it builds test programs |
| 134 |
# & extra -m32 executables |
| 135 |
- emake |
| 136 |
- emake -C programs |
| 137 |
+ emake -C lib liblz4 liblz4.pc |
| 138 |
+ emake -C programs lz4 lz4c |
| 139 |
+ # work around lack of proper target dependencies |
| 140 |
+ touch lib/liblz4 |
| 141 |
} |
| 142 |
|
| 143 |
multilib_src_install() { |
Archives