[gentoo-commits] repo/gentoo:master commit in: sys-apps/toybox/files/, sys-apps/toybox/

[gentoo-commits] repo/gentoo:master commit in: sys-apps/toybox/files/, sys-apps/toybox/

[Mike Frysinger]

commit:     8e5c9b1561465e616b0e48200de7d6345d793b1c
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 29 18:38:34 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Mon Feb 29 18:54:00 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e5c9b15

sys-apps/toybox: misc build fixes from upstream

 sys-apps/toybox/files/toybox-0.7.0-includes.patch  | 24 +++++++++++++
 .../toybox/files/toybox-0.7.0-parallel-build.patch | 40 ++++++++++++++++++++++
 sys-apps/toybox/files/toybox-0.7.0-sysmacros.patch | 28 +++++++++++++++
 sys-apps/toybox/toybox-0.7.0.ebuild                |  3 ++
 4 files changed, 95 insertions(+)

diff --git a/sys-apps/toybox/files/toybox-0.7.0-includes.patch b/sys-apps/toybox/files/toybox-0.7.0-includes.patch
new file mode 100644
index 0000000..9a10e96
--- /dev/null
+++ b/sys-apps/toybox/files/toybox-0.7.0-includes.patch
@@ -0,0 +1,24 @@
+From 5e1c429eec977cd365f490137ca9dede0caef662 Mon Sep 17 00:00:00 2001
+From: Rob Landley <rob@landley.net>
+Date: Fri, 5 Feb 2016 15:13:24 -0600
+Subject: [PATCH] Debian unstable is even more pedantic than previous debian.
+
+---
+ scripts/mktags.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/scripts/mktags.c b/scripts/mktags.c
+index 3604260..9c23cf1 100644
+--- a/scripts/mktags.c
++++ b/scripts/mktags.c
+@@ -3,6 +3,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <ctype.h>
+ 
+ int main(int argc, char *argv[])
+ {
+-- 
+2.6.2
+

diff --git a/sys-apps/toybox/files/toybox-0.7.0-parallel-build.patch b/sys-apps/toybox/files/toybox-0.7.0-parallel-build.patch
new file mode 100644
index 0000000..ed0797c
--- /dev/null
+++ b/sys-apps/toybox/files/toybox-0.7.0-parallel-build.patch
@@ -0,0 +1,40 @@
+fix from upstream for flaky parallel builds
+
+From e17fbf19c4b48d763041761052e98c2b4ee95487 Mon Sep 17 00:00:00 2001
+From: Rob Landley <rob@landley.net>
+Date: Fri, 26 Feb 2016 00:22:15 -0600
+Subject: [PATCH] Switch to $! for make.sh process enumeration.
+
+---
+ scripts/make.sh | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/scripts/make.sh b/scripts/make.sh
+index 84dda34..c73a03d 100755
+--- a/scripts/make.sh
++++ b/scripts/make.sh
+@@ -264,17 +264,17 @@ do
+   LFILES="$LFILES $OUT"
+   [ "$OUT" -nt "$i" ] && continue
+   do_loudly $BUILD -c $i -o $OUT &
++  PENDING="$PENDING $!"
+ 
+   # ratelimit to $CPUS many parallel jobs, detecting errors
+ 
+   while true
+   do
+-    PENDING="$(echo $PENDING $(jobs -rp) | tr ' ' '\n' | sort -u)"
+-    [ $(echo -n "$PENDING" | wc -l) -lt "$CPUS" ] && break;
++    [ $(echo "$PENDING" | wc -w) -lt "$CPUS" ] && break;
+ 
+-    wait $(echo "$PENDING" | head -n 1)
++    wait $(echo "$PENDING" | awk '{print $1}')
+     DONE=$(($DONE+$?))
+-    PENDING="$(echo "$PENDING" | tail -n +2)"
++    PENDING="$(echo "$PENDING" | sed 's/^ *[0-9]*//')"
+   done
+   [ $DONE -ne 0 ] && break
+ done
+-- 
+2.6.2
+

diff --git a/sys-apps/toybox/files/toybox-0.7.0-sysmacros.patch b/sys-apps/toybox/files/toybox-0.7.0-sysmacros.patch
new file mode 100644
index 0000000..245ad23
--- /dev/null
+++ b/sys-apps/toybox/files/toybox-0.7.0-sysmacros.patch
@@ -0,0 +1,28 @@
+From 99e5c17b5fe5a93066e81cc6fcc7ebf386cb6183 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Mon, 29 Feb 2016 13:35:05 -0500
+Subject: [PATCH] include sys/sysmacros.h
+
+The major/minor macros are defined in sys/sysmacros.h.  This has
+historically been pulled in implicitly by sys/types.h, but C libs
+are moving away from that as they aren't in POSIX.  Use the header
+directly as defined by BSD systems.
+---
+ toys.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/toys.h b/toys.h
+index 8a29730..5e640a1 100644
+--- a/toys.h
++++ b/toys.h
+@@ -34,6 +34,7 @@
+ #include <sys/resource.h>
+ #include <sys/stat.h>
+ #include <sys/statvfs.h>
++#include <sys/sysmacros.h>
+ #include <sys/time.h>
+ #include <sys/times.h>
+ #include <sys/utsname.h>
+-- 
+2.6.2
+

diff --git a/sys-apps/toybox/toybox-0.7.0.ebuild b/sys-apps/toybox/toybox-0.7.0.ebuild
index 71beeaa..92688c3 100644
--- a/sys-apps/toybox/toybox-0.7.0.ebuild
+++ b/sys-apps/toybox/toybox-0.7.0.ebuild
@@ -26,6 +26,9 @@ SLOT="0"
 IUSE=""
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-parallel-build.patch
+	epatch "${FILESDIR}"/${P}-includes.patch
+	epatch "${FILESDIR}"/${P}-sysmacros.patch
 	epatch_user
 	restore_config .config
 }

[gentoo-commits] repo/gentoo:master commit in: sys-apps/toybox/files/, sys-apps/toybox/

[Sam James]

commit:     7ee34ba33700f03beba8eb436f5afc697b61ed63
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  8 03:19:33 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Feb  8 03:19:46 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ee34ba3

sys-apps/toybox: add 0.8.9

Closes: https://bugs.gentoo.org/874825
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-apps/toybox/Manifest                               |  1 +
 .../toybox/files/toybox-0.8.9-verbose-build-fix.patch  | 18 ++++++++++++++++++
 .../toybox/{toybox-9999.ebuild => toybox-0.8.9.ebuild} | 16 ++++++++++------
 sys-apps/toybox/toybox-9999.ebuild                     | 16 ++++++++++------
 4 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/sys-apps/toybox/Manifest b/sys-apps/toybox/Manifest
index ba6f861052d8..20175538592d 100644
--- a/sys-apps/toybox/Manifest
+++ b/sys-apps/toybox/Manifest
@@ -1 +1,2 @@
 DIST toybox-0.8.8.tar.gz 3492750 BLAKE2B d53864e07392a511e4e861fcf5b0fdc8b43e5d82f13fb9eba62b850053aa547e0e057245062c34d4205019bba6223dff1a514b1bb0dde54734bcd3b1df82b122 SHA512 3ffe4de6b17770ad9c43f98f2c69a110f94e5a85da909f8f770bbc9abaff42a524237b4ffaaa8b9800c8d31f0a8b6d3521f03bfdd0d1260fa421ef2525a34290
+DIST toybox-0.8.9.tar.gz 3517516 BLAKE2B 1c57fe43785c1925762de6d8c3af012d3726b18338b0543ce3c775fefdcf1121327c1486d28786e42aafa5b5e7208475d942a02099715b0cb751e79788326622 SHA512 73a3ec2a0d69b1566e1663e94b2bc7764b9f93e53978725f036f066837ab2769033e8bf17d5550e565656781cacf27d93960dd611ffed5425fa006d1d3104351

diff --git a/sys-apps/toybox/files/toybox-0.8.9-verbose-build-fix.patch b/sys-apps/toybox/files/toybox-0.8.9-verbose-build-fix.patch
new file mode 100644
index 000000000000..d629ffddfe28
--- /dev/null
+++ b/sys-apps/toybox/files/toybox-0.8.9-verbose-build-fix.patch
@@ -0,0 +1,18 @@
+https://github.com/landley/toybox/commit/c5e7495fe46d4b2b2c225f222efc6b9070de2c3a
+
+From c5e7495fe46d4b2b2c225f222efc6b9070de2c3a Mon Sep 17 00:00:00 2001
+From: Rob Landley <rob@landley.net>
+Date: Fri, 13 Jan 2023 11:50:58 -0600
+Subject: [PATCH] Ensure make wrapper sees success return code in verbose mode
+ (V=1)
+
+--- a/scripts/make.sh
++++ b/scripts/make.sh
+@@ -303,4 +303,5 @@ fi
+ # multiplexer binary via truncate-and-write through a symlink.
+ do_loudly chmod 555 "$OUTNAME" || exit 1
+ 
+-[ -z "$V" ] && echo >&2
++# Ensure make wrapper sees success return code
++[ -z "$V" ] && echo >&2 || true
+

diff --git a/sys-apps/toybox/toybox-9999.ebuild b/sys-apps/toybox/toybox-0.8.9.ebuild
similarity index 84%
copy from sys-apps/toybox/toybox-9999.ebuild
copy to sys-apps/toybox/toybox-0.8.9.ebuild
index 888ca615d7a4..d890b64c89af 100644
--- a/sys-apps/toybox/toybox-9999.ebuild
+++ b/sys-apps/toybox/toybox-0.8.9.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit multiprocessing savedconfig toolchain-funcs
 
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/landley/toybox.git"
 else
 	SRC_URI="https://landley.net/code/toybox/downloads/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
 DESCRIPTION="Common linux commands in a multicall binary"
@@ -22,6 +22,10 @@ SLOT="0"
 DEPEND="virtual/libcrypt:="
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-verbose-build-fix.patch
+)
+
 src_prepare() {
 	default
 	restore_config .config
@@ -45,14 +49,14 @@ src_configure() {
 src_compile() {
 	unset CROSS_COMPILE
 	export CPUS=$(makeopts_jobs)
-	emake V=1
+	emake V=1 NOSTRIP=1
 }
 
 src_test() {
-	emake test
+	emake V=1 test
 }
 
 src_install() {
 	save_config .config
-	newbin generated/unstripped/toybox toybox
+	dobin toybox
 }

diff --git a/sys-apps/toybox/toybox-9999.ebuild b/sys-apps/toybox/toybox-9999.ebuild
index 888ca615d7a4..d890b64c89af 100644
--- a/sys-apps/toybox/toybox-9999.ebuild
+++ b/sys-apps/toybox/toybox-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit multiprocessing savedconfig toolchain-funcs
 
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/landley/toybox.git"
 else
 	SRC_URI="https://landley.net/code/toybox/downloads/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
 DESCRIPTION="Common linux commands in a multicall binary"
@@ -22,6 +22,10 @@ SLOT="0"
 DEPEND="virtual/libcrypt:="
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-verbose-build-fix.patch
+)
+
 src_prepare() {
 	default
 	restore_config .config
@@ -45,14 +49,14 @@ src_configure() {
 src_compile() {
 	unset CROSS_COMPILE
 	export CPUS=$(makeopts_jobs)
-	emake V=1
+	emake V=1 NOSTRIP=1
 }
 
 src_test() {
-	emake test
+	emake V=1 test
 }
 
 src_install() {
 	save_config .config
-	newbin generated/unstripped/toybox toybox
+	dobin toybox
 }