diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2020-03-20 20:02:18 +0100 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2020-03-20 20:02:18 +0100 |
| commit | 164363f78449fd945fc67228409ea94fd66dc882 (patch) | |
| tree | 1b0632e0a6a76a6f95f4bce20c4be2ad7720349c /app-arch/zstd/zstd-1.4.4-r3.ebuild | |
| parent | dev-util/cmake: Bump to version 3.17.0. Removed old (diff) | |
| download | gentoo-164363f78449fd945fc67228409ea94fd66dc882.tar.gz gentoo-164363f78449fd945fc67228409ea94fd66dc882.tar.bz2 gentoo-164363f78449fd945fc67228409ea94fd66dc882.zip | |
app-arch/zstd: Use upstream fix for pkgconfig libdir
- Shortened make43 patch name
- Simplified ebuild a bit
Closes: https://bugs.gentoo.org/700780
Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Diffstat (limited to 'app-arch/zstd/zstd-1.4.4-r3.ebuild')
| -rw-r--r-- | app-arch/zstd/zstd-1.4.4-r3.ebuild | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/app-arch/zstd/zstd-1.4.4-r3.ebuild b/app-arch/zstd/zstd-1.4.4-r3.ebuild index d5c67e17ca2c..d9f50e824921 100644 --- a/app-arch/zstd/zstd-1.4.4-r3.ebuild +++ b/app-arch/zstd/zstd-1.4.4-r3.ebuild @@ -19,8 +19,8 @@ RDEPEND="app-arch/xz-utils DEPEND="${RDEPEND}" PATCHES=( - "${FILESDIR}/${PN}-1.4.4-pkgconfig_fix.patch" #700780 - "${FILESDIR}/${P}-build-issue-More-portable-header-prefix-usage-1987.patch" #708110 + "${FILESDIR}/${P}-pkgconfig_libdir.patch" #700780 + "${FILESDIR}/${P}-make43.patch" #708110 ) src_prepare() { @@ -39,11 +39,9 @@ mymake() { } multilib_src_compile() { - if use threads; then - mymake -C lib libzstd-mt libzstd.a-mt libzstd.pc - else - mymake -C lib libzstd libzstd.a libzstd.pc - fi + local libzstd_targets=( libzstd{,.a}$(usex threads '-mt' '') ) + + mymake -C lib ${libzstd_targets[@]} libzstd.pc if multilib_is_native_abi ; then mymake HAVE_LZ4="$(usex lz4 1 0)" zstd |