From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1289015838C for ; Tue, 30 Jan 2024 05:10:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CA7DEE2A4C; Tue, 30 Jan 2024 05:10:41 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A7E89E2A4C for ; Tue, 30 Jan 2024 05:10:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 959003430A6 for ; Tue, 30 Jan 2024 05:10:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C5E971494 for ; Tue, 30 Jan 2024 05:10:38 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1706591389.bfc8cfd714b89d0349f77047e8cb057bbb74f92b.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/busybox/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/busybox/busybox-1.36.1-r1.ebuild sys-apps/busybox/busybox-9999.ebuild X-VCS-Directories: sys-apps/busybox/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: bfc8cfd714b89d0349f77047e8cb057bbb74f92b X-VCS-Branch: master Date: Tue, 30 Jan 2024 05:10:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d7c0999c-ed3c-421f-ab52-77865aa55971 X-Archives-Hash: d30325b14f8b8d6ca126dcb1541ab4d0 commit: bfc8cfd714b89d0349f77047e8cb057bbb74f92b Author: Eli Schwartz gmail com> AuthorDate: Fri Jan 26 05:17:30 2024 +0000 Commit: Sam James gentoo 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 gmail.com> Signed-off-by: Sam James 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):" \