diff options
author | Eli Schwartz <eschwartz93@gmail.com> | 2024-02-06 08:15:10 -0500 |
---|---|---|
committer | Sam James <sam@gentoo.org> | 2024-02-06 22:49:30 +0000 |
commit | c2aab29d5dad2191f966d19e094d20d9b1b69aab (patch) | |
tree | b1e3495749ed5d1fca2162904524553d04c7e06a /sys-apps/attr | |
parent | sys-apps/systemd-utils: remove usr-ldscript support (diff) | |
download | gentoo-c2aab29d5dad2191f966d19e094d20d9b1b69aab.tar.gz gentoo-c2aab29d5dad2191f966d19e094d20d9b1b69aab.tar.bz2 gentoo-c2aab29d5dad2191f966d19e094d20d9b1b69aab.zip |
sys-apps/attr: 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-apps/attr')
-rw-r--r-- | sys-apps/attr/attr-2.5.2-r1.ebuild (renamed from sys-apps/attr/attr-2.5.2.ebuild) | 7 | ||||
-rw-r--r-- | sys-apps/attr/attr-9999.ebuild | 7 |
2 files changed, 2 insertions, 12 deletions
diff --git a/sys-apps/attr/attr-2.5.2.ebuild b/sys-apps/attr/attr-2.5.2-r1.ebuild index 0c5a2dce3464..8aac35056b3e 100644 --- a/sys-apps/attr/attr-2.5.2.ebuild +++ b/sys-apps/attr/attr-2.5.2-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit multilib-minimal usr-ldscript +inherit multilib-minimal if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://git.savannah.gnu.org/git/${PN}.git" @@ -53,11 +53,6 @@ multilib_src_configure() { multilib_src_install() { emake DESTDIR="${D}" install - if multilib_is_native_abi; then - # We install attr into /bin, so we need the shared lib with it - gen_usr_ldscript -a attr - fi - # Add a wrapper until people upgrade. # TODO: figure out when this was added & when we can drop it! insinto /usr/include/attr diff --git a/sys-apps/attr/attr-9999.ebuild b/sys-apps/attr/attr-9999.ebuild index 0c5a2dce3464..8aac35056b3e 100644 --- a/sys-apps/attr/attr-9999.ebuild +++ b/sys-apps/attr/attr-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit multilib-minimal usr-ldscript +inherit multilib-minimal if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://git.savannah.gnu.org/git/${PN}.git" @@ -53,11 +53,6 @@ multilib_src_configure() { multilib_src_install() { emake DESTDIR="${D}" install - if multilib_is_native_abi; then - # We install attr into /bin, so we need the shared lib with it - gen_usr_ldscript -a attr - fi - # Add a wrapper until people upgrade. # TODO: figure out when this was added & when we can drop it! insinto /usr/include/attr |