1 |
commit: 19b5e7f05524f7788c35cc0e13f437358ca43f1c |
2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Dec 27 10:25:11 2020 +0000 |
4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Dec 27 10:25:11 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=19b5e7f0 |
7 |
|
8 |
app-arch/bzip2: drop one more mint remnant |
9 |
|
10 |
Package-Manager: Portage-3.0.12-prefix, Repoman-3.0.2 |
11 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
12 |
|
13 |
app-arch/bzip2/bzip2-1.0.6-r10.ebuild | 8 ++------ |
14 |
1 file changed, 2 insertions(+), 6 deletions(-) |
15 |
|
16 |
diff --git a/app-arch/bzip2/bzip2-1.0.6-r10.ebuild b/app-arch/bzip2/bzip2-1.0.6-r10.ebuild |
17 |
index 7a3d83fdd5..c41ed39dff 100644 |
18 |
--- a/app-arch/bzip2/bzip2-1.0.6-r10.ebuild |
19 |
+++ b/app-arch/bzip2/bzip2-1.0.6-r10.ebuild |
20 |
@@ -71,16 +71,13 @@ multilib_src_compile() { |
21 |
case "${CHOST}" in |
22 |
*-darwin*) |
23 |
bemake PREFIX="${EPREFIX}"/usr -f "${S}"/Makefile-libbz2_dylib all |
24 |
- # FWIW, #504648 like for .so below |
25 |
- ln -sf libbz2.${PV}.dylib libbz2.dylib |
26 |
;; |
27 |
*) |
28 |
bemake -f "${S}"/Makefile-libbz2_so all |
29 |
- # Make sure we link against the shared lib #504648 |
30 |
- [[ $(get_libname) != $(get_libname ${PV}) ]] && |
31 |
- ln -sf libbz2$(get_libname ${PV}) libbz2$(get_libname) |
32 |
;; |
33 |
esac |
34 |
+ # Make sure we link against the shared lib #504648 |
35 |
+ ln -sf libbz2$(get_libname ${PV}) libbz2$(get_libname) |
36 |
bemake -f "${S}"/Makefile all LDFLAGS="${LDFLAGS} $(usex static -static '')" |
37 |
} |
38 |
|
39 |
@@ -94,7 +91,6 @@ multilib_src_install() { |
40 |
dolib.so libbz2$(get_libname ${PV}) |
41 |
[[ ${CHOST} == *-cygwin* ]] && dobin cygbz2-${PV%%.*}.dll |
42 |
local v |
43 |
- [[ $(get_libname) != $(get_libname ${PV}) ]] && |
44 |
for v in libbz2$(get_libname) libbz2$(get_libname ${PV%%.*}) libbz2$(get_libname ${PV%.*}) ; do |
45 |
dosym libbz2$(get_libname ${PV}) /usr/$(get_libdir)/${v} |
46 |
done |