commit:     ecfd5d6b7c9ffe7370e4901d1bdc7a34cc30314d
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Jul  4 01:39:36 2024 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Jul  4 01:41:45 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecfd5d6b

sys-apps/busybox: move KBUILD_OUTPUT and SKIP_STRIP

Set/unset these before we call bbmake for the first time.
Thanks to Peter Levine for the diagnosis.

Closes: https://bugs.gentoo.org/932445
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 sys-apps/busybox/busybox-1.36.1-r1.ebuild | 6 +++---
 sys-apps/busybox/busybox-1.36.1-r2.ebuild | 6 +++---
 sys-apps/busybox/busybox-9999.ebuild      | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/sys-apps/busybox/busybox-1.36.1-r1.ebuild 
b/sys-apps/busybox/busybox-1.36.1-r1.ebuild
index 98369ddbf32e..19f861692f33 100644
--- a/sys-apps/busybox/busybox-1.36.1-r1.ebuild
+++ b/sys-apps/busybox/busybox-1.36.1-r1.ebuild
@@ -116,6 +116,9 @@ bbmake() {
 }
 
 src_configure() {
+       unset KBUILD_OUTPUT #88088
+       export SKIP_STRIP=y
+
        tc-export AR CC BUILD_CC PKG_CONFIG
 
        tc-is-cross-compiler || BUILD_CFLAGS=${CFLAGS}
@@ -236,9 +239,6 @@ src_configure() {
 }
 
 src_compile() {
-       unset KBUILD_OUTPUT #88088
-       export SKIP_STRIP=y
-
        bbmake busybox
 
        # bug #701512

diff --git a/sys-apps/busybox/busybox-1.36.1-r2.ebuild 
b/sys-apps/busybox/busybox-1.36.1-r2.ebuild
index fc700c3b31e4..cd06d97bc0d3 100644
--- a/sys-apps/busybox/busybox-1.36.1-r2.ebuild
+++ b/sys-apps/busybox/busybox-1.36.1-r2.ebuild
@@ -117,6 +117,9 @@ bbmake() {
 }
 
 src_configure() {
+       unset KBUILD_OUTPUT #88088
+       export SKIP_STRIP=y
+
        tc-export AR CC BUILD_CC PKG_CONFIG
 
        tc-is-cross-compiler || BUILD_CFLAGS=${CFLAGS}
@@ -237,9 +240,6 @@ src_configure() {
 }
 
 src_compile() {
-       unset KBUILD_OUTPUT #88088
-       export SKIP_STRIP=y
-
        bbmake busybox
 
        # bug #701512

diff --git a/sys-apps/busybox/busybox-9999.ebuild 
b/sys-apps/busybox/busybox-9999.ebuild
index fc700c3b31e4..cd06d97bc0d3 100644
--- a/sys-apps/busybox/busybox-9999.ebuild
+++ b/sys-apps/busybox/busybox-9999.ebuild
@@ -117,6 +117,9 @@ bbmake() {
 }
 
 src_configure() {
+       unset KBUILD_OUTPUT #88088
+       export SKIP_STRIP=y
+
        tc-export AR CC BUILD_CC PKG_CONFIG
 
        tc-is-cross-compiler || BUILD_CFLAGS=${CFLAGS}
@@ -237,9 +240,6 @@ src_configure() {
 }
 
 src_compile() {
-       unset KBUILD_OUTPUT #88088
-       export SKIP_STRIP=y
-
        bbmake busybox
 
        # bug #701512

Reply via email to