| 1 |
commit: 24bd40b29cd3f3b9249f945638fb483d93a4fb51 |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jun 16 22:55:24 2021 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jun 16 22:55:49 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24bd40b2 |
| 7 |
|
| 8 |
dev-util/unifdef: tweak tests for non-en locale and missing 'cc' |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
| 11 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-util/unifdef/files/unifdef-2.12-tests.patch | 24 ++++++++++++++++++++++++ |
| 14 |
dev-util/unifdef/unifdef-2.12.ebuild | 2 ++ |
| 15 |
2 files changed, 26 insertions(+) |
| 16 |
|
| 17 |
diff --git a/dev-util/unifdef/files/unifdef-2.12-tests.patch b/dev-util/unifdef/files/unifdef-2.12-tests.patch |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..2f7d151250c |
| 20 |
--- /dev/null |
| 21 |
+++ b/dev-util/unifdef/files/unifdef-2.12-tests.patch |
| 22 |
@@ -0,0 +1,24 @@ |
| 23 |
+https://github.com/fanf2/unifdef/pull/13 |
| 24 |
+ |
| 25 |
+--- a/tests/multi-generic-sh |
| 26 |
++++ b/tests/multi-generic-sh |
| 27 |
+@@ -9,7 +9,7 @@ unifdef -M~ $opts $mfiles |
| 28 |
+ e=$? |
| 29 |
+ for f in $mfiles |
| 30 |
+ do |
| 31 |
+- diff -u $f~ $f | sed '/^[+-]\{3\} /s/ .*//' |
| 32 |
++ LANG=C diff -u $f~ $f | sed '/^[+-]\{3\} /s/ .*//' |
| 33 |
+ rm -f $f~ $f |
| 34 |
+ done |
| 35 |
+ exit $e |
| 36 |
+--- a/unifdefall.sh |
| 37 |
++++ b/unifdefall.sh |
| 38 |
+@@ -48,7 +48,7 @@ export LC_ALL=C |
| 39 |
+ # list of all controlling macros; assume these are undefined |
| 40 |
+ "$unifdef" $debug -s "$@" | sort -u | sed 's/^/#undef /' >"$tmp/undefs" |
| 41 |
+ # list of all macro definitions |
| 42 |
+-cc -E -dM "$@" | sort >"$tmp/defs" |
| 43 |
++${CC-cc} -E -dM "$@" | sort >"$tmp/defs" |
| 44 |
+ |
| 45 |
+ case $debug in |
| 46 |
+ -d) cat "$tmp/undefs" "$tmp/defs" 1>&2 |
| 47 |
|
| 48 |
diff --git a/dev-util/unifdef/unifdef-2.12.ebuild b/dev-util/unifdef/unifdef-2.12.ebuild |
| 49 |
index cf3ba7f6416..d936e5d6a08 100644 |
| 50 |
--- a/dev-util/unifdef/unifdef-2.12.ebuild |
| 51 |
+++ b/dev-util/unifdef/unifdef-2.12.ebuild |
| 52 |
@@ -13,6 +13,8 @@ LICENSE="BSD" |
| 53 |
SLOT="0" |
| 54 |
KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" |
| 55 |
|
| 56 |
+PATCHES=("${FILESDIR}"/${P}-tests.patch) |
| 57 |
+ |
| 58 |
DOCS=( README ) |
| 59 |
|
| 60 |
src_prepare() { |
Archives