gentoo auto-resync : 26:04:2024 - 23:59:36

4 files changed, 87 insertions, 54 deletions

diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 3c06d38072c3..2e999cbdddcf 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -19,7 +19,7 @@ AUX syslogd.initd 267 BLAKE2B 1daf252138bfb5904feb04dcc2127b8e8058d9d43652474e75
 AUX watchdog.confd 232 BLAKE2B 14ff3813297bc987e98bf3cabee2e7b150e23d8aa9f016303396569ffca3633b3e048497f85649c20d769233baa430a4cb54d2d5e5d63646db8113761960552d SHA512 8fd7121075535195f3e5d43ec773713c883fb7865cd5e5927b3b20c2605c50acb81d50461bd1a246c1282006ce74b11932ac1cec67ddc2be15da2f9aa8674232
 AUX watchdog.initd 219 BLAKE2B 3726fec4551962d6e20859c52e18582fbf127e2fc2807379afe9d490ad32b19a6d10d456155fdeb0468c67816f061b1cac166db7f104dbadadf0d175082efdb4 SHA512 d329fb72ce078a95a1fb77b72321dee56d19c76b45cb78a7a57a46d9fa385b982a114be49dd8696c2d4fc2b2dd90a17ee728ef2938172cc2f8b12b5a9ebd62f5
 DIST busybox-1.36.1.tar.bz2 2525473 BLAKE2B e515825cb3ab1c520e16b9c2512e9fc72947366a72a0466bff59b507fdffbc78fc9d16b44a26116175fc7a429d849ad944b1bc379d36c6d3a0eb20969997336e SHA512 8c0c754c9ae04b5e6b23596283a7d3a4ef96225fe179f92d6f6a99c69c0caa95b1aa56c267f52d7c807f6cc69e1f0b7dd29a8ac624098f601738f8c0c57980d4
-EBUILD busybox-1.36.1-r1.ebuild 10681 BLAKE2B 9e56637f6098a139e7a789bb5646b63588dad38c33f3f2eb3b493a8a20adcdaa95120a5282dcd1a4faa2dd419768f440e2e93c13e6a2e55a454e055a287a0d38 SHA512 980e5449cbcad5c74001fb3ac11c5b5d636a459cf4e9f2ae6f4f92a05cae6c8add5e7c63f09b4d6e9922aa465bff0cbaddfeaa9f70f852f6c83667f59147bacc
-EBUILD busybox-1.36.1-r2.ebuild 10734 BLAKE2B 89dd7e6c1f513c6f6f21529336fd350b974b7c5b9efbc796fa15fdaed837844887682c5c07c5fd2307ca9c21671cb2a8d599cf9c021ffc9e50a095200cffc663 SHA512 d4dd190df22083b3aa1d2d1ce3f27f1b3ed7321170511383342771537024406563b7327bd9924bdc3c6ed0d7c609c0cc24c07bb116ce205a3028443c699c1ff1
-EBUILD busybox-9999.ebuild 10734 BLAKE2B 89dd7e6c1f513c6f6f21529336fd350b974b7c5b9efbc796fa15fdaed837844887682c5c07c5fd2307ca9c21671cb2a8d599cf9c021ffc9e50a095200cffc663 SHA512 d4dd190df22083b3aa1d2d1ce3f27f1b3ed7321170511383342771537024406563b7327bd9924bdc3c6ed0d7c609c0cc24c07bb116ce205a3028443c699c1ff1
+EBUILD busybox-1.36.1-r1.ebuild 10690 BLAKE2B 249304b13194107ef236a8ca7cdffc127a835e543aad5ab8e3b7b8129d3ec257aa4f105bb82885c549b1aac4881db8d7cbd4e89167ada33be2768e7abba0de1e SHA512 f835d1442be0467dca86f77d8e68a7711b423665afd56721e0ad09af1c64bf667d497750a38d8aa6ca84788c89796da3db9f7f68c6cf27f01bb60c62719ce6e4
+EBUILD busybox-1.36.1-r2.ebuild 10743 BLAKE2B c0fda120798bb5f7a6e2eeed618bfd733305daa31a53410543e1e88166ece92671d576eca725972b167f850348870dfe7374b760c18df26dd948257ec9e9067d SHA512 5caf45fcb8ffbed86de32fafc55528945146276cec756f2eff25d8fc5887b6549b5c5195ad38657515d2e05c4b0601f616ec0cc4e892176809ca98c58fb59504
+EBUILD busybox-9999.ebuild 10743 BLAKE2B c0fda120798bb5f7a6e2eeed618bfd733305daa31a53410543e1e88166ece92671d576eca725972b167f850348870dfe7374b760c18df26dd948257ec9e9067d SHA512 5caf45fcb8ffbed86de32fafc55528945146276cec756f2eff25d8fc5887b6549b5c5195ad38657515d2e05c4b0601f616ec0cc4e892176809ca98c58fb59504
 MISC metadata.xml 873 BLAKE2B d9c3725e1c3587d497894761d9eda08b670522d5c1a5518ea879cb5c9f222519005d28a36d6dea0b34d4bf4a2352e54aa151177f98ac730ce5b83e87ae4d35a2 SHA512 4c74f718046b41fbcf0111c797d6cdfa1f647914bfa5ff9aaedd6844ba1367722f225ed8ac17717d7b44c5ddc3b450e130da46cc0f6e21501b66cfd267a8f9ad
diff --git a/sys-apps/busybox/busybox-1.36.1-r1.ebuild b/sys-apps/busybox/busybox-1.36.1-r1.ebuild
index 78c429beefc9..98369ddbf32e 100644
--- a/sys-apps/busybox/busybox-1.36.1-r1.ebuild
+++ b/sys-apps/busybox/busybox-1.36.1-r1.ebuild
@@ -87,9 +87,6 @@ PATCHES=(
 
 src_prepare() {
 	default
-	unset KBUILD_OUTPUT #88088
-	append-flags -fno-strict-aliasing #310413
-	use ppc64 && append-flags -mminimal-toc #130943
 
 	cp "${FILESDIR}"/ginit.c init/ || die
 
@@ -98,13 +95,6 @@ src_prepare() {
 		-e 's:[[:space:]]?-(Werror|Os|Oz|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \
 		Makefile.flags || die
 	sed -i \
-		-e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \
-		-e "/^AR\>/s:=.*:= $(tc-getAR):" \
-		-e "/^CC\>/s:=.*:= $(tc-getCC):" \
-		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
-		-e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \
-		Makefile || die
-	sed -i \
 		-e 's:-static-libgcc::' \
 		Makefile.flags || die
 
@@ -112,13 +102,34 @@ src_prepare() {
 	sed -i -e 's:debug=false:debug=true:' scripts/trylink || die
 }
 
+bbmake() {
+	local args=(
+		V=1
+		CROSS_COMPILE="${CHOST}-"
+		AR="${AR}"
+		CC="${CC}"
+		HOSTCC="${BUILD_CC}"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		PKG_CONFIG="${PKG_CONFIG}"
+	)
+	emake "${args[@]}" "$@"
+}
+
 src_configure() {
+	tc-export AR CC BUILD_CC PKG_CONFIG
+
+	tc-is-cross-compiler || BUILD_CFLAGS=${CFLAGS}
+	BUILD_CFLAGS+=" -D_FILE_OFFSET_BITS=64" #930513
+
+	append-flags -fno-strict-aliasing #310413
+	use ppc64 && append-flags -mminimal-toc #130943
+
 	# check for a busybox config before making one of our own.
 	# if one exist lets return and use it.
 
 	restore_config .config
 	if [ -f .config ]; then
-		yes "" | emake -j1 -s oldconfig >/dev/null
+		yes "" | bbmake -j1 oldconfig
 		return 0
 	else
 		ewarn "Could not locate user configfile, so we will save a default one"
@@ -127,11 +138,11 @@ src_configure() {
 	# setting SKIP_SELINUX skips searching for selinux at this stage. We don't
 	# need to search now in case we end up not needing it after all.
 	# setup the config file
-	emake -j1 -s allyesconfig SKIP_SELINUX=$(usex selinux n y) >/dev/null #620918
+	bbmake -j1 allyesconfig SKIP_SELINUX=$(usex selinux n y) #620918
 	# nommu forces a bunch of things off which we want on #387555
 	busybox_config_option n NOMMU
 	sed -i '/^#/d' .config
-	yes "" | emake -j1 -s oldconfig SKIP_SELINUX=$(usex selinux n y) >/dev/null #620918
+	yes "" | bbmake -j1 oldconfig SKIP_SELINUX=$(usex selinux n y) #620918
 
 	# now turn off stuff we really don't want
 	busybox_config_option n DMALLOC
@@ -221,17 +232,17 @@ src_configure() {
 		busybox_config_option n ${opt}
 	done
 
-	emake -j1 oldconfig > /dev/null
+	bbmake -j1 oldconfig
 }
 
 src_compile() {
 	unset KBUILD_OUTPUT #88088
 	export SKIP_STRIP=y
 
-	emake V=1 busybox
+	bbmake busybox
 
 	# bug #701512
-	emake V=1 doc
+	bbmake doc
 }
 
 src_install() {
@@ -304,7 +315,7 @@ src_install() {
 	fi
 
 	# bundle up the symlink files for use later
-	emake DESTDIR="${ED}" install
+	bbmake DESTDIR="${ED}" install
 	# for compatibility, provide /usr/bin/env
 	mkdir -p _install/usr/bin || die
 	if [[ ! -e _install/usr/bin/env ]]; then
diff --git a/sys-apps/busybox/busybox-1.36.1-r2.ebuild b/sys-apps/busybox/busybox-1.36.1-r2.ebuild
index 74082ac77ae5..fc700c3b31e4 100644
--- a/sys-apps/busybox/busybox-1.36.1-r2.ebuild
+++ b/sys-apps/busybox/busybox-1.36.1-r2.ebuild
@@ -88,9 +88,6 @@ PATCHES=(
 
 src_prepare() {
 	default
-	unset KBUILD_OUTPUT #88088
-	append-flags -fno-strict-aliasing #310413
-	use ppc64 && append-flags -mminimal-toc #130943
 
 	cp "${FILESDIR}"/ginit.c init/ || die
 
@@ -99,13 +96,6 @@ src_prepare() {
 		-e 's:[[:space:]]?-(Werror|Os|Oz|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \
 		Makefile.flags || die
 	sed -i \
-		-e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \
-		-e "/^AR\>/s:=.*:= $(tc-getAR):" \
-		-e "/^CC\>/s:=.*:= $(tc-getCC):" \
-		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
-		-e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \
-		Makefile || die
-	sed -i \
 		-e 's:-static-libgcc::' \
 		Makefile.flags || die
 
@@ -113,13 +103,34 @@ src_prepare() {
 	sed -i -e 's:debug=false:debug=true:' scripts/trylink || die
 }
 
+bbmake() {
+	local args=(
+		V=1
+		CROSS_COMPILE="${CHOST}-"
+		AR="${AR}"
+		CC="${CC}"
+		HOSTCC="${BUILD_CC}"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		PKG_CONFIG="${PKG_CONFIG}"
+	)
+	emake "${args[@]}" "$@"
+}
+
 src_configure() {
+	tc-export AR CC BUILD_CC PKG_CONFIG
+
+	tc-is-cross-compiler || BUILD_CFLAGS=${CFLAGS}
+	BUILD_CFLAGS+=" -D_FILE_OFFSET_BITS=64" #930513
+
+	append-flags -fno-strict-aliasing #310413
+	use ppc64 && append-flags -mminimal-toc #130943
+
 	# check for a busybox config before making one of our own.
 	# if one exist lets return and use it.
 
 	restore_config .config
 	if [ -f .config ]; then
-		yes "" | emake -j1 -s oldconfig >/dev/null
+		yes "" | bbmake -j1 oldconfig
 		return 0
 	else
 		ewarn "Could not locate user configfile, so we will save a default one"
@@ -128,11 +139,11 @@ src_configure() {
 	# setting SKIP_SELINUX skips searching for selinux at this stage. We don't
 	# need to search now in case we end up not needing it after all.
 	# setup the config file
-	emake -j1 -s allyesconfig SKIP_SELINUX=$(usex selinux n y) >/dev/null #620918
+	bbmake -j1 allyesconfig SKIP_SELINUX=$(usex selinux n y) #620918
 	# nommu forces a bunch of things off which we want on #387555
 	busybox_config_option n NOMMU
 	sed -i '/^#/d' .config
-	yes "" | emake -j1 -s oldconfig SKIP_SELINUX=$(usex selinux n y) >/dev/null #620918
+	yes "" | bbmake -j1 oldconfig SKIP_SELINUX=$(usex selinux n y) #620918
 
 	# now turn off stuff we really don't want
 	busybox_config_option n DMALLOC
@@ -222,17 +233,17 @@ src_configure() {
 		busybox_config_option n ${opt}
 	done
 
-	emake -j1 oldconfig > /dev/null
+	bbmake -j1 oldconfig
 }
 
 src_compile() {
 	unset KBUILD_OUTPUT #88088
 	export SKIP_STRIP=y
 
-	emake V=1 busybox
+	bbmake busybox
 
 	# bug #701512
-	emake V=1 doc
+	bbmake doc
 }
 
 src_install() {
@@ -305,7 +316,7 @@ src_install() {
 	fi
 
 	# bundle up the symlink files for use later
-	emake DESTDIR="${ED}" install
+	bbmake DESTDIR="${ED}" install
 	# for compatibility, provide /usr/bin/env
 	mkdir -p _install/usr/bin || die
 	if [[ ! -e _install/usr/bin/env ]]; then
diff --git a/sys-apps/busybox/busybox-9999.ebuild b/sys-apps/busybox/busybox-9999.ebuild
index 74082ac77ae5..fc700c3b31e4 100644
--- a/sys-apps/busybox/busybox-9999.ebuild
+++ b/sys-apps/busybox/busybox-9999.ebuild
@@ -88,9 +88,6 @@ PATCHES=(
 
 src_prepare() {
 	default
-	unset KBUILD_OUTPUT #88088
-	append-flags -fno-strict-aliasing #310413
-	use ppc64 && append-flags -mminimal-toc #130943
 
 	cp "${FILESDIR}"/ginit.c init/ || die
 
@@ -99,13 +96,6 @@ src_prepare() {
 		-e 's:[[:space:]]?-(Werror|Os|Oz|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \
 		Makefile.flags || die
 	sed -i \
-		-e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \
-		-e "/^AR\>/s:=.*:= $(tc-getAR):" \
-		-e "/^CC\>/s:=.*:= $(tc-getCC):" \
-		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
-		-e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \
-		Makefile || die
-	sed -i \
 		-e 's:-static-libgcc::' \
 		Makefile.flags || die
 
@@ -113,13 +103,34 @@ src_prepare() {
 	sed -i -e 's:debug=false:debug=true:' scripts/trylink || die
 }
 
+bbmake() {
+	local args=(
+		V=1
+		CROSS_COMPILE="${CHOST}-"
+		AR="${AR}"
+		CC="${CC}"
+		HOSTCC="${BUILD_CC}"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		PKG_CONFIG="${PKG_CONFIG}"
+	)
+	emake "${args[@]}" "$@"
+}
+
 src_configure() {
+	tc-export AR CC BUILD_CC PKG_CONFIG
+
+	tc-is-cross-compiler || BUILD_CFLAGS=${CFLAGS}
+	BUILD_CFLAGS+=" -D_FILE_OFFSET_BITS=64" #930513
+
+	append-flags -fno-strict-aliasing #310413
+	use ppc64 && append-flags -mminimal-toc #130943
+
 	# check for a busybox config before making one of our own.
 	# if one exist lets return and use it.
 
 	restore_config .config
 	if [ -f .config ]; then
-		yes "" | emake -j1 -s oldconfig >/dev/null
+		yes "" | bbmake -j1 oldconfig
 		return 0
 	else
 		ewarn "Could not locate user configfile, so we will save a default one"
@@ -128,11 +139,11 @@ src_configure() {
 	# setting SKIP_SELINUX skips searching for selinux at this stage. We don't
 	# need to search now in case we end up not needing it after all.
 	# setup the config file
-	emake -j1 -s allyesconfig SKIP_SELINUX=$(usex selinux n y) >/dev/null #620918
+	bbmake -j1 allyesconfig SKIP_SELINUX=$(usex selinux n y) #620918
 	# nommu forces a bunch of things off which we want on #387555
 	busybox_config_option n NOMMU
 	sed -i '/^#/d' .config
-	yes "" | emake -j1 -s oldconfig SKIP_SELINUX=$(usex selinux n y) >/dev/null #620918
+	yes "" | bbmake -j1 oldconfig SKIP_SELINUX=$(usex selinux n y) #620918
 
 	# now turn off stuff we really don't want
 	busybox_config_option n DMALLOC
@@ -222,17 +233,17 @@ src_configure() {
 		busybox_config_option n ${opt}
 	done
 
-	emake -j1 oldconfig > /dev/null
+	bbmake -j1 oldconfig
 }
 
 src_compile() {
 	unset KBUILD_OUTPUT #88088
 	export SKIP_STRIP=y
 
-	emake V=1 busybox
+	bbmake busybox
 
 	# bug #701512
-	emake V=1 doc
+	bbmake doc
 }
 
 src_install() {
@@ -305,7 +316,7 @@ src_install() {
 	fi
 
 	# bundle up the symlink files for use later
-	emake DESTDIR="${ED}" install
+	bbmake DESTDIR="${ED}" install
 	# for compatibility, provide /usr/bin/env
 	mkdir -p _install/usr/bin || die
 	if [[ ! -e _install/usr/bin/env ]]; then