diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2019-11-28 18:47:39 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-12-09 10:23:47 +0000 |
commit | e3dadc9f28c24a8d182121d0246b3d9ec048846a (patch) | |
tree | 759d02626e497d1d06558ac6e565a377a5953da9 | |
parent | 126efdad243e1a3bead5b695df6656e94353dd46 (diff) |
gettext: adapt for version 0.203.1_M2
Drop backported patch (new gettext includes the updates).
Drop version from the .bbappend (hopefully no version-specific
tweaks will be needed going forward).
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
-rw-r--r-- | recipes-core/gettext/gettext/fix-gl_cv_prog_as_underscore-test.patch | 67 | ||||
-rw-r--r-- | recipes-core/gettext/gettext_%.bbappend (renamed from recipes-core/gettext/gettext_0.19.%.bbappend) | 1 |
2 files changed, 0 insertions, 68 deletions
diff --git a/recipes-core/gettext/gettext/fix-gl_cv_prog_as_underscore-test.patch b/recipes-core/gettext/gettext/fix-gl_cv_prog_as_underscore-test.patch deleted file mode 100644 index 636789f..0000000 --- a/recipes-core/gettext/gettext/fix-gl_cv_prog_as_underscore-test.patch +++ /dev/null @@ -1,67 +0,0 @@ -Backport gnulib fix for mingw into gettext's included version of gnulib - -http://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=68b6adebef05670a312fb92b05e7bd089d2ed43a - -Upstream-Status: Backport -Signed-off-by: Nathan Rossi <nathan@nathanrossi.com> - ---- a/gettext-runtime/gnulib-m4/asm-underscore.m4 -+++ b/gettext-runtime/gnulib-m4/asm-underscore.m4 -@@ -27,11 +27,11 @@ - #endif - int foo(void) { return 0; } - EOF - # Look for the assembly language name in the .s file. - AC_TRY_COMMAND(${CC-cc} $CFLAGS $CPPFLAGS $gl_c_asm_opt conftest.c) >/dev/null 2>&1 -- if LC_ALL=C grep -E '(^|[^a-zA-Z0-9_])_foo([^a-zA-Z0-9_]|$)' conftest.$gl_asmext >/dev/null; then -+ if LC_ALL=C grep -E '(^|[[^a-zA-Z0-9_]])_foo([[^a-zA-Z0-9_]]|$)' conftest.$gl_asmext >/dev/null; then - gl_cv_prog_as_underscore=yes - else - gl_cv_prog_as_underscore=no - fi - rm -f conftest* ---- a/gettext-runtime/configure -+++ b/gettext-runtime/configure -@@ -24601,11 +24601,11 @@ - { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 - (eval $ac_try) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; } >/dev/null 2>&1 -- if LC_ALL=C grep -E '(^|^a-zA-Z0-9_)_foo(^a-zA-Z0-9_|$)' conftest.$gl_asmext >/dev/null; then -+ if LC_ALL=C grep -E '(^|[^a-zA-Z0-9_])_foo([^a-zA-Z0-9_]|$)' conftest.$gl_asmext >/dev/null; then - gl_cv_prog_as_underscore=yes - else - gl_cv_prog_as_underscore=no - fi - rm -f conftest* ---- a/gettext-tools/gnulib-m4/asm-underscore.m4 -+++ b/gettext-tools/gnulib-m4/asm-underscore.m4 -@@ -27,11 +27,11 @@ - #endif - int foo(void) { return 0; } - EOF - # Look for the assembly language name in the .s file. - AC_TRY_COMMAND(${CC-cc} $CFLAGS $CPPFLAGS $gl_c_asm_opt conftest.c) >/dev/null 2>&1 -- if LC_ALL=C grep -E '(^|[^a-zA-Z0-9_])_foo([^a-zA-Z0-9_]|$)' conftest.$gl_asmext >/dev/null; then -+ if LC_ALL=C grep -E '(^|[[^a-zA-Z0-9_]])_foo([[^a-zA-Z0-9_]]|$)' conftest.$gl_asmext >/dev/null; then - gl_cv_prog_as_underscore=yes - else - gl_cv_prog_as_underscore=no - fi - rm -f conftest* ---- a/gettext-tools/configure -+++ b/gettext-tools/configure -@@ -32284,11 +32284,11 @@ - { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 - (eval $ac_try) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; } >/dev/null 2>&1 -- if LC_ALL=C grep -E '(^|^a-zA-Z0-9_)_foo(^a-zA-Z0-9_|$)' conftest.$gl_asmext >/dev/null; then -+ if LC_ALL=C grep -E '(^|[^a-zA-Z0-9_])_foo([^a-zA-Z0-9_]|$)' conftest.$gl_asmext >/dev/null; then - gl_cv_prog_as_underscore=yes - else - gl_cv_prog_as_underscore=no - fi - rm -f conftest* diff --git a/recipes-core/gettext/gettext_0.19.%.bbappend b/recipes-core/gettext/gettext_%.bbappend index 21749f3..d518698 100644 --- a/recipes-core/gettext/gettext_0.19.%.bbappend +++ b/recipes-core/gettext/gettext_%.bbappend @@ -2,7 +2,6 @@ EXTRA_OECONF_append_mingw32 = " --enable-static" FILESEXTRAPATHS_prepend_mingw32 := "${THISDIR}/${BPN}:" SRC_URI_append_mingw32 = " \ - file://fix-gl_cv_prog_as_underscore-test.patch \ " FILES_libgettextlib_mingw32 = "${bindir}/libgettextlib-*.dll" |