| 1 |
commit: 7b91537e45d994472257b35250cc1f398c404722 |
| 2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sat Apr 28 07:43:35 2018 +0000 |
| 4 |
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat May 5 01:22:00 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b91537e |
| 7 |
|
| 8 |
sys-apps/toybox: remove unused patches |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/650190 |
| 11 |
|
| 12 |
sys-apps/toybox/files/toybox-0.7.0-includes.patch | 24 ------------- |
| 13 |
.../toybox/files/toybox-0.7.0-parallel-build.patch | 40 ---------------------- |
| 14 |
sys-apps/toybox/files/toybox-0.7.0-sysmacros.patch | 28 --------------- |
| 15 |
3 files changed, 92 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sys-apps/toybox/files/toybox-0.7.0-includes.patch b/sys-apps/toybox/files/toybox-0.7.0-includes.patch |
| 18 |
deleted file mode 100644 |
| 19 |
index 9a10e96510b..00000000000 |
| 20 |
--- a/sys-apps/toybox/files/toybox-0.7.0-includes.patch |
| 21 |
+++ /dev/null |
| 22 |
@@ -1,24 +0,0 @@ |
| 23 |
-From 5e1c429eec977cd365f490137ca9dede0caef662 Mon Sep 17 00:00:00 2001 |
| 24 |
-From: Rob Landley <rob@×××××××.net> |
| 25 |
-Date: Fri, 5 Feb 2016 15:13:24 -0600 |
| 26 |
-Subject: [PATCH] Debian unstable is even more pedantic than previous debian. |
| 27 |
- |
| 28 |
---- |
| 29 |
- scripts/mktags.c | 1 + |
| 30 |
- 1 file changed, 1 insertion(+) |
| 31 |
- |
| 32 |
-diff --git a/scripts/mktags.c b/scripts/mktags.c |
| 33 |
-index 3604260..9c23cf1 100644 |
| 34 |
---- a/scripts/mktags.c |
| 35 |
-+++ b/scripts/mktags.c |
| 36 |
-@@ -3,6 +3,7 @@ |
| 37 |
- #include <stdio.h> |
| 38 |
- #include <stdlib.h> |
| 39 |
- #include <string.h> |
| 40 |
-+#include <ctype.h> |
| 41 |
- |
| 42 |
- int main(int argc, char *argv[]) |
| 43 |
- { |
| 44 |
--- |
| 45 |
-2.6.2 |
| 46 |
- |
| 47 |
|
| 48 |
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 |
| 49 |
deleted file mode 100644 |
| 50 |
index ed0797cf86c..00000000000 |
| 51 |
--- a/sys-apps/toybox/files/toybox-0.7.0-parallel-build.patch |
| 52 |
+++ /dev/null |
| 53 |
@@ -1,40 +0,0 @@ |
| 54 |
-fix from upstream for flaky parallel builds |
| 55 |
- |
| 56 |
-From e17fbf19c4b48d763041761052e98c2b4ee95487 Mon Sep 17 00:00:00 2001 |
| 57 |
-From: Rob Landley <rob@×××××××.net> |
| 58 |
-Date: Fri, 26 Feb 2016 00:22:15 -0600 |
| 59 |
-Subject: [PATCH] Switch to $! for make.sh process enumeration. |
| 60 |
- |
| 61 |
---- |
| 62 |
- scripts/make.sh | 8 ++++---- |
| 63 |
- 1 file changed, 4 insertions(+), 4 deletions(-) |
| 64 |
- |
| 65 |
-diff --git a/scripts/make.sh b/scripts/make.sh |
| 66 |
-index 84dda34..c73a03d 100755 |
| 67 |
---- a/scripts/make.sh |
| 68 |
-+++ b/scripts/make.sh |
| 69 |
-@@ -264,17 +264,17 @@ do |
| 70 |
- LFILES="$LFILES $OUT" |
| 71 |
- [ "$OUT" -nt "$i" ] && continue |
| 72 |
- do_loudly $BUILD -c $i -o $OUT & |
| 73 |
-+ PENDING="$PENDING $!" |
| 74 |
- |
| 75 |
- # ratelimit to $CPUS many parallel jobs, detecting errors |
| 76 |
- |
| 77 |
- while true |
| 78 |
- do |
| 79 |
-- PENDING="$(echo $PENDING $(jobs -rp) | tr ' ' '\n' | sort -u)" |
| 80 |
-- [ $(echo -n "$PENDING" | wc -l) -lt "$CPUS" ] && break; |
| 81 |
-+ [ $(echo "$PENDING" | wc -w) -lt "$CPUS" ] && break; |
| 82 |
- |
| 83 |
-- wait $(echo "$PENDING" | head -n 1) |
| 84 |
-+ wait $(echo "$PENDING" | awk '{print $1}') |
| 85 |
- DONE=$(($DONE+$?)) |
| 86 |
-- PENDING="$(echo "$PENDING" | tail -n +2)" |
| 87 |
-+ PENDING="$(echo "$PENDING" | sed 's/^ *[0-9]*//')" |
| 88 |
- done |
| 89 |
- [ $DONE -ne 0 ] && break |
| 90 |
- done |
| 91 |
--- |
| 92 |
-2.6.2 |
| 93 |
- |
| 94 |
|
| 95 |
diff --git a/sys-apps/toybox/files/toybox-0.7.0-sysmacros.patch b/sys-apps/toybox/files/toybox-0.7.0-sysmacros.patch |
| 96 |
deleted file mode 100644 |
| 97 |
index 245ad23f4f7..00000000000 |
| 98 |
--- a/sys-apps/toybox/files/toybox-0.7.0-sysmacros.patch |
| 99 |
+++ /dev/null |
| 100 |
@@ -1,28 +0,0 @@ |
| 101 |
-From 99e5c17b5fe5a93066e81cc6fcc7ebf386cb6183 Mon Sep 17 00:00:00 2001 |
| 102 |
-From: Mike Frysinger <vapier@g.o> |
| 103 |
-Date: Mon, 29 Feb 2016 13:35:05 -0500 |
| 104 |
-Subject: [PATCH] include sys/sysmacros.h |
| 105 |
- |
| 106 |
-The major/minor macros are defined in sys/sysmacros.h. This has |
| 107 |
-historically been pulled in implicitly by sys/types.h, but C libs |
| 108 |
-are moving away from that as they aren't in POSIX. Use the header |
| 109 |
-directly as defined by BSD systems. |
| 110 |
---- |
| 111 |
- toys.h | 1 + |
| 112 |
- 1 file changed, 1 insertion(+) |
| 113 |
- |
| 114 |
-diff --git a/toys.h b/toys.h |
| 115 |
-index 8a29730..5e640a1 100644 |
| 116 |
---- a/toys.h |
| 117 |
-+++ b/toys.h |
| 118 |
-@@ -34,6 +34,7 @@ |
| 119 |
- #include <sys/resource.h> |
| 120 |
- #include <sys/stat.h> |
| 121 |
- #include <sys/statvfs.h> |
| 122 |
-+#include <sys/sysmacros.h> |
| 123 |
- #include <sys/time.h> |
| 124 |
- #include <sys/times.h> |
| 125 |
- #include <sys/utsname.h> |
| 126 |
--- |
| 127 |
-2.6.2 |
| 128 |
- |
Archives