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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5A9CD158013 for ; Sat, 16 Dec 2023 10:38:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A03792BC018; Sat, 16 Dec 2023 10:38:54 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7F0882BC018 for ; Sat, 16 Dec 2023 10:38:54 +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 889D4335D6A for ; Sat, 16 Dec 2023 10:38:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EC965979 for ; Sat, 16 Dec 2023 10:38:51 +0000 (UTC) From: "Viorel Munteanu" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Viorel Munteanu" Message-ID: <1702723102.ed57d39eb8c2eb8f64654befcc19d51a93708d41.ceamac@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/busybox/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/busybox/busybox-9999.ebuild X-VCS-Directories: sys-apps/busybox/ X-VCS-Committer: ceamac X-VCS-Committer-Name: Viorel Munteanu X-VCS-Revision: ed57d39eb8c2eb8f64654befcc19d51a93708d41 X-VCS-Branch: master Date: Sat, 16 Dec 2023 10:38:51 +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: c8946738-98be-4261-923f-d91dbca831aa X-Archives-Hash: 28672ab79315fcf5af50a98d62c6b4f4 commit: ed57d39eb8c2eb8f64654befcc19d51a93708d41 Author: Viorel Munteanu gentoo org> AuthorDate: Sat Dec 16 10:38:22 2023 +0000 Commit: Viorel Munteanu gentoo org> CommitDate: Sat Dec 16 10:38:22 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed57d39e sys-apps/busybox: sync live ebuild Signed-off-by: Viorel Munteanu gentoo.org> sys-apps/busybox/busybox-9999.ebuild | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/sys-apps/busybox/busybox-9999.ebuild b/sys-apps/busybox/busybox-9999.ebuild index 8a030a712279..5028429069a8 100644 --- a/sys-apps/busybox/busybox-9999.ebuild +++ b/sys-apps/busybox/busybox-9999.ebuild @@ -5,7 +5,7 @@ EAPI=8 -inherit flag-o-matic savedconfig toolchain-funcs +inherit flag-o-matic readme.gentoo-r1 savedconfig toolchain-funcs DESCRIPTION="Utilities for rescue and embedded systems" HOMEPAGE="https://www.busybox.net/" @@ -43,6 +43,10 @@ DEPEND="${RDEPEND} sys-kernel/linux-headers" BDEPEND="virtual/pkgconfig" +DISABLE_AUTOFORMATTING=yes +DOC_CONTENTS=' +If you want a smaller executable, add `-Oz` to your busybox `CFLAGS`.' + busybox_config_option() { local flag=$1 ; shift if [[ ${flag} != [yn] && ${flag} != \"* ]] ; then @@ -91,7 +95,7 @@ src_prepare() { # flag cleanup sed -i -r \ - -e 's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \ + -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 @@ -331,6 +335,8 @@ src_install() { cd ../networking || die dodoc httpd_indexcgi.c httpd_post_upload.cgi + + readme.gentoo_create_doc } pkg_preinst() { @@ -360,4 +366,14 @@ pkg_postinst() { elog "To get a rescue shell, you may boot with:" elog " init=/ginit bb" fi + + if [[ ${MERGE_TYPE} != binary ]] && ! is-flagq -Oz; then + for v in ${REPLACING_VERSIONS}; do + if ver_test ${v} -le 1.36.1; then + FORCE_PRINT_ELOG=yes + fi + done + + readme.gentoo_print_elog + fi }