[gentoo-commits] repo/gentoo:master commit in: sys-apps/busybox/

[Sam James]

commit:     bfc8cfd714b89d0349f77047e8cb057bbb74f92b
Author:     Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Fri Jan 26 05:17:30 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 30 05:09:49 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfc8cfd7

sys-apps/busybox: remove pointless seds

These seds predate the import of ::gentoo into git in 2015, and were
pointless even then. The relevant code was removed from busybox upstream
in 2007.

See upstream commits:
- 3240474c23bf4f47536a854693b4cbacb54b9b04
- 3f9c84857617b0cf0d1824664e371fb6a4cac2e3

Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-apps/busybox/busybox-1.36.1-r1.ebuild | 3 ---
 sys-apps/busybox/busybox-9999.ebuild      | 5 +----
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/sys-apps/busybox/busybox-1.36.1-r1.ebuild 
b/sys-apps/busybox/busybox-1.36.1-r1.ebuild
index 4692f79e7fd2..78c429beefc9 100644
--- a/sys-apps/busybox/busybox-1.36.1-r1.ebuild
+++ b/sys-apps/busybox/busybox-1.36.1-r1.ebuild
@@ -97,9 +97,6 @@ src_prepare() {
        sed -i -r \
                -e 
's:[[:space:]]?-(Werror|Os|Oz|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g'
 \
                Makefile.flags || die
-       #sed -i '/bbsh/s:^//::' include/applets.h
-       sed -i '/^#error Aborting compilation./d' applets/applets.c || die
-       use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile
        sed -i \
                -e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \
                -e "/^AR\>/s:=.*:= $(tc-getAR):" \

diff --git a/sys-apps/busybox/busybox-9999.ebuild 
b/sys-apps/busybox/busybox-9999.ebuild
index 5028429069a8..7b6a96b8b9cd 100644
--- a/sys-apps/busybox/busybox-9999.ebuild
+++ b/sys-apps/busybox/busybox-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # See `man savedconfig.eclass` for info on how to use USE=savedconfig.
@@ -97,9 +97,6 @@ src_prepare() {
        sed -i -r \
                -e 
's:[[:space:]]?-(Werror|Os|Oz|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g'
 \
                Makefile.flags || die
-       #sed -i '/bbsh/s:^//::' include/applets.h
-       sed -i '/^#error Aborting compilation./d' applets/applets.c || die
-       use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile
        sed -i \
                -e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \
                -e "/^AR\>/s:=.*:= $(tc-getAR):" \