summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz93@gmail.com>2024-02-06 00:50:41 -0500
committerSam James <sam@gentoo.org>2024-02-06 22:44:02 +0000
commitf9efb6a33633d85afc85372f0a2f92516b20294f (patch)
treea14f673adea008db323be9bdd0ae7c87663fe730 /sys-libs
parentapp-arch/xz-utils: remove usr-ldscript support (diff)
downloadgentoo-f9efb6a33633d85afc85372f0a2f92516b20294f.tar.gz
gentoo-f9efb6a33633d85afc85372f0a2f92516b20294f.tar.bz2
gentoo-f9efb6a33633d85afc85372f0a2f92516b20294f.zip
sys-libs/zlib: remove usr-ldscript support
Per news item 2024-01-05-usr-initramfs, we no longer support this use case. It is fragile and hacky and leads to bizarre forms of load errors. The functionality is, despite being called "split-usr", not really about split-usr at all. Signed-off-by: Eli Schwartz <eschwartz93@gmail.com> Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'sys-libs')
-rw-r--r--sys-libs/zlib/zlib-1.3-r4.ebuild (renamed from sys-libs/zlib/zlib-1.3-r3.ebuild)3
-rw-r--r--sys-libs/zlib/zlib-1.3.1-r1.ebuild (renamed from sys-libs/zlib/zlib-1.3.1.ebuild)3
2 files changed, 2 insertions, 4 deletions
diff --git a/sys-libs/zlib/zlib-1.3-r3.ebuild b/sys-libs/zlib/zlib-1.3-r4.ebuild
index 1c7cc6d899c1..5ec332438f41 100644
--- a/sys-libs/zlib/zlib-1.3-r3.ebuild
+++ b/sys-libs/zlib/zlib-1.3-r4.ebuild
@@ -6,7 +6,7 @@ EAPI=8
# Worth keeping an eye on 'develop' branch upstream for possible backports.
AUTOTOOLS_AUTO_DEPEND="no"
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/madler.asc
-inherit autotools edo multilib-minimal flag-o-matic usr-ldscript verify-sig
+inherit autotools edo multilib-minimal flag-o-matic verify-sig
DESCRIPTION="Standard (de)compression library"
HOMEPAGE="https://zlib.net/"
@@ -145,7 +145,6 @@ multilib_src_install() {
*)
emake install DESTDIR="${D}" LDCONFIG=:
- gen_usr_ldscript -a z
;;
esac
diff --git a/sys-libs/zlib/zlib-1.3.1.ebuild b/sys-libs/zlib/zlib-1.3.1-r1.ebuild
index f12a76540f6e..fb44717aca45 100644
--- a/sys-libs/zlib/zlib-1.3.1.ebuild
+++ b/sys-libs/zlib/zlib-1.3.1-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
# Worth keeping an eye on 'develop' branch upstream for possible backports.
AUTOTOOLS_AUTO_DEPEND="no"
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/madler.asc
-inherit autotools edo multilib-minimal flag-o-matic usr-ldscript verify-sig
+inherit autotools edo multilib-minimal flag-o-matic verify-sig
DESCRIPTION="Standard (de)compression library"
HOMEPAGE="https://zlib.net/"
@@ -142,7 +142,6 @@ multilib_src_install() {
*)
emake install DESTDIR="${D}" LDCONFIG=:
- gen_usr_ldscript -a z
;;
esac