diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2020-04-11 13:46:09 -0400 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2020-04-11 13:46:48 -0400 |
| commit | 970736fe78dc0c25b1497ff8e5f153c8d2dcc5ff (patch) | |
| tree | 40a155e592cffe923a0c66408dff9d61379165a4 | |
| parent | Revert "app-arch/bzip2: add landmine to ensure SLOT gets updated" (diff) | |
| download | gentoo-970736fe78dc0c25b1497ff8e5f153c8d2dcc5ff.tar.gz gentoo-970736fe78dc0c25b1497ff8e5f153c8d2dcc5ff.tar.bz2 gentoo-970736fe78dc0c25b1497ff8e5f153c8d2dcc5ff.zip | |
app-arch/bzip2: ensure libbz2.so.1.0 gets installed
Package-Manager: Portage-2.3.96_p4, Repoman-2.3.22_p1
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
| -rw-r--r-- | app-arch/bzip2/bzip2-1.0.8-r1.ebuild | 8 | ||||
| -rw-r--r-- | app-arch/bzip2/bzip2-9999.ebuild | 7 |
2 files changed, 15 insertions, 0 deletions
diff --git a/app-arch/bzip2/bzip2-1.0.8-r1.ebuild b/app-arch/bzip2/bzip2-1.0.8-r1.ebuild index e1e25b90ee47..34b92d2ea541 100644 --- a/app-arch/bzip2/bzip2-1.0.8-r1.ebuild +++ b/app-arch/bzip2/bzip2-1.0.8-r1.ebuild @@ -71,6 +71,14 @@ multilib_src_install() { for v in libbz2.so{,.{${PV%%.*},${PV%.*}}} ; do dosym libbz2.so.${PV} /usr/$(get_libdir)/${v} done + + # Install libbz2.so.1.0 due to accidental soname change in 1.0.7. + # Reference: 98da0ad82192d21ad74ae52366ea8466e2acea24. + # OK to remove one year after 2020-04-11. + if [[ ! -L "${ED}/usr/$(get_libdir)/libbz2.so.1.0" ]]; then + dosym libbz2.so.${PV} "/usr/$(get_libdir)/libbz2.so.1.0" + fi + use static-libs && dolib.a libbz2.a if multilib_is_native_abi ; then diff --git a/app-arch/bzip2/bzip2-9999.ebuild b/app-arch/bzip2/bzip2-9999.ebuild index a0c9cd7a462f..579f0b8f44dd 100644 --- a/app-arch/bzip2/bzip2-9999.ebuild +++ b/app-arch/bzip2/bzip2-9999.ebuild @@ -36,6 +36,13 @@ multilib_src_compile() { multilib_src_install() { meson_src_install + # Install libbz2.so.1.0 due to accidental soname change in 1.0.7. + # Reference: 98da0ad82192d21ad74ae52366ea8466e2acea24. + # OK to remove one year after 2020-04-11. + if [[ ! -L "${ED}/usr/$(get_libdir)/libbz2.so.1.0" ]]; then + dosym libbz2.so.1 "/usr/$(get_libdir)/libbz2.so.1.0" + fi + if multilib_is_native_abi ; then gen_usr_ldscript -a bz2 |