diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-05-06 11:18:16 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-05-06 11:18:16 +0100 |
commit | ebce8994fe3cc4ca9fbc96ca837cb4c4e98adcbd (patch) | |
tree | f2204ce5f94dc3cb13728ff93649d889944952bb /sys-apps/toybox | |
parent | fe1c8b732bd548b699d4c2ef725f67f8b8c8911c (diff) |
gentoo resync : 06.05.2018
Diffstat (limited to 'sys-apps/toybox')
-rw-r--r-- | sys-apps/toybox/Manifest | 3 | ||||
-rw-r--r-- | sys-apps/toybox/files/toybox-0.7.0-includes.patch | 24 | ||||
-rw-r--r-- | sys-apps/toybox/files/toybox-0.7.0-parallel-build.patch | 40 | ||||
-rw-r--r-- | sys-apps/toybox/files/toybox-0.7.0-sysmacros.patch | 28 |
4 files changed, 0 insertions, 95 deletions
diff --git a/sys-apps/toybox/Manifest b/sys-apps/toybox/Manifest index 26fc883af557..5c5b811edb89 100644 --- a/sys-apps/toybox/Manifest +++ b/sys-apps/toybox/Manifest @@ -1,6 +1,3 @@ -AUX toybox-0.7.0-includes.patch 556 BLAKE2B 651e566be279aed75013763a0fa7c2c330d6c6ccccaad3e9d01c85bbedfbac7d2ab612acd223763fa1f625d863aebccf324708f41939715f0d453b1214cd3f77 SHA512 83b243f10be79855ca007214055043bdb2da6fba8734a87355faf357a84796a647f6b1d312ee8223ad60122b9fab5f44cf6372b116fb43c408fc320221a39174 -AUX toybox-0.7.0-parallel-build.patch 1148 BLAKE2B af79f6c228b17f72a15535ab5ad8e15870fc8a7f40b816a33a6d8b28ee9107543507d570a1abc3ceaa141bd0a993d37e9e5a58764fd33af4e379023b3b28498e SHA512 b60ce1e8cb33203bea57d9cc757a872f87c55b378a8315d90c125ab9dadbf60d6b7a4bb444f9ae7b08c82ed29e211014aeadb767d5c0954816df66d823c3ba02 -AUX toybox-0.7.0-sysmacros.patch 768 BLAKE2B 80bbad5bd28d41e8aaaf4271bdb4842461291dbd00375ad481f0d1bc2f9c1beb26edafab07f0085b6944b15075763065798d5a4cc157309096e6ce331e7caf3f SHA512 8c43465012b93f7ec175d6d166a8f73475dd37fc1a09df5be25b12de57248ab155b1056ac488cd091433c9de9a602443ed57238818eddd02e41355412d27d19b DIST toybox-0.7.5.tar.gz 818815 BLAKE2B 0d91eb07b9c2e64c611be24eb09aac7ffc26d65f3dd39ee7663419e4eff1e9d559b7b6e8df0dc8e13986124aefa706b343c4a3521466f2bdf657d4c9a82a9fc2 SHA512 f0cc54da2394ed14b41dbc80bf674f86989f0312b645b9e1e5403fb0a3282cafce9608b2d738ab2dbb6fe3779eed70d51133a867c6ea76683dd7e6de245df127 DIST toybox-0.7.6.tar.gz 834351 BLAKE2B 7c6737a8b16f77fd7a5e389be17ef8eb41d28718e46231ec1aa48af0a0ec1cbdc1c0b74670c3f79f58a5b0547f47aa6e5ccbaccc5451b12a80e1c566ee49a30d SHA512 1ed06114f5feb46e642bfeee517366a16c0a5d76562841a3cdf6b003bb330be10d4ac5009c7cf845eb5ea99bb8ae8b4291c413bbd45fd89c2ae3e4a69c1455bb EBUILD toybox-0.7.5.ebuild 1153 BLAKE2B 7045659da4001b0791fcaffffcdc2d3d362ffd5ca6b4f7b9faef6c4d7a6afd25a0649953017faa10ce10d5c8724da274518a1fe9e37718bf8f832bae308c6677 SHA512 5e70c6665773d9bbf334ffb8f0d90005e76b3e47c3eb8d1796738a619c5d5743a7eec476e1d4bbbe721b561916b7f15759c3ae2dd3f1e6952b9050b913ebdea5 diff --git a/sys-apps/toybox/files/toybox-0.7.0-includes.patch b/sys-apps/toybox/files/toybox-0.7.0-includes.patch deleted file mode 100644 index 9a10e96510b0..000000000000 --- a/sys-apps/toybox/files/toybox-0.7.0-includes.patch +++ /dev/null @@ -1,24 +0,0 @@ -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 deleted file mode 100644 index ed0797cf86c8..000000000000 --- a/sys-apps/toybox/files/toybox-0.7.0-parallel-build.patch +++ /dev/null @@ -1,40 +0,0 @@ -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 deleted file mode 100644 index 245ad23f4f71..000000000000 --- a/sys-apps/toybox/files/toybox-0.7.0-sysmacros.patch +++ /dev/null @@ -1,28 +0,0 @@ -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 - |