gettext: adapt for version 0.20
PATCH 1/1 gettext: adapt for version 0.20
Drop backported patch (new gettext includes the updates).
Drop version from the .bbappend (hopefully no version-specific tweaks will be needed going forward).
---
.../fix-gl_cv_prog_as_underscore-test.patch | 67 -------------------
...ext_0.19.%.bbappend => gettext_%.bbappend} | 1 -
2 files changed, 68 deletions(-)
delete mode 100644 recipes-core/gettext/gettext/fix-gl_cv_prog_as_underscore-test.patch
rename recipes-core/gettext/{gettext_0.19.%.bbappend => gettext_%.bbappend} (87%)recipes-core/gettext/gettext/fix-gl_cv_prog_as_underscore-test.patch deleted +0 -67
@@ -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 <[email protected]> - ---- 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*
recipes-core/gettext/gettext_%.bbappend renamed from recipes-core/gettext/gettext_0.19.%.bbappend +0 -1
@@ -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"
Signature · 1 line
2.17.1
Quoted 5 lines · Alexander Kanavin
Drop backported patch (new gettext includes the updates).
Drop version from the .bbappend (hopefully no version-specific tweaks will be needed going forward).
I've applied this to master-next, we can pull up master once the oe-core patch lands. I'm assuming this will break the current master AB builds if it's applied to master without the oe-core patch?
Quoted 108 lines
Signed-off-by Alexander Kanavin <[email protected]>--- .../fix-gl_cv_prog_as_underscore-test.patch | 67 ------------------- ...ext_0.19.%.bbappend => gettext_%.bbappend} | 1 - 2 files changed, 68 deletions(-) delete mode 100644 recipes-core/gettext/gettext/fix-gl_cv_prog_as_underscore-test.patch rename recipes-core/gettext/{gettext_0.19.%.bbappend => gettext_%.bbappend} (87%)recipes-core/gettext/gettext/fix-gl_cv_prog_as_underscore-test.patch deleted +0
-67@@ -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 <[email protected]> - ---- 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*recipes-core/gettext/gettext_%.bbappend renamed from recipes-core/gettext/gettext_0.19.%.bbappend +0
-2@@ -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" --2.17.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.View/Reply Online (#47462): https://lists.yoctoproject.org/g/yocto/message/47462
Mute This Topic: https://lists.yoctoproject.org/mt/64260047/3616693
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Quoted 12 lines · Joshua Watt
Quoted 5 lines · Alexander Kanavin
Drop backported patch (new gettext includes the updates).
Drop version from the .bbappend (hopefully no version-specific tweaks will be needed going forward).
I've applied this to master-next, we can pull up master once the oe-core patch lands. I'm assuming this will break the current master AB builds if it's applied to master without the oe-core patch?
It probably will, yes (I didn't test, but it drops a patch that's apparently needed in 0.19).
Alex
Quoted 128 lines
Quoted 7 lines
Signed-off-by Alexander Kanavin <[email protected]>--- .../fix-gl_cv_prog_as_underscore-test.patch | 67 ------------------- ...ext_0.19.%.bbappend => gettext_%.bbappend} | 1 - 2 files changed, 68 deletions(-) delete mode 100644
recipes-core/gettext/gettext/fix-gl_cv_prog_as_underscore-test.patchQuoted 1 line
rename recipes-core/gettext/{gettext_0.19.%.bbappend =>gettext_%.bbappend} (87%)
Quoted 2 lines
diff --git
a/recipes-core/gettext/gettext/fix-gl_cv_prog_as_underscore-test.patchb/recipes-core/gettext/gettext/fix-gl_cv_prog_as_underscore-test.patchQuoted 3 lines
deleted file mode 100644
index 636789f..0000000
---
a/recipes-core/gettext/gettext/fix-gl_cv_prog_as_underscore-test.patchrecipes-core/gettext/gettext/fix-gl_cv_prog_as_underscore-test.patch line 3
Quoted 5 lines
+++
/dev/nullrecipes-core/gettext/gettext/fix-gl_cv_prog_as_underscore-test.patch deleted +0
-3@@ -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
recipes-core/gettext/gettext/fix-gl_cv_prog_as_underscore-test.patch
Quoted 12 lines
recipes-core/gettext/gettext/fix-gl_cv_prog_as_underscore-test.patch deleted +0
-12- -Upstream-Status: Backport -Signed-off-by: Nathan Rossi <[email protected]> - ---- 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>&1Review line 16
Quoted 1 line
(quoted diff) +0
-1-- if LC_ALL=C grep -E '(^|[^a-zA-Z0-9_])_foo([^a-zA-Z0-9_]|$)'conftest.$gl_asmext >/dev/null; then
Review line 17
Quoted 1 line
(quoted diff) +0
-1-+ if LC_ALL=C grep -E '(^|[[^a-zA-Z0-9_]])_foo([[^a-zA-Z0-9_]]|$)'conftest.$gl_asmext >/dev/null; then
Quoted 4 lines
recipes-core/gettext/gettext/fix-gl_cv_prog_as_underscore-test.patch deleted +0
-4- gl_cv_prog_as_underscore=yes - else - gl_cv_prog_as_underscore=no - firecipes-core/gettext/gettext/fix-gl_cv_prog_as_underscore-test.patch
Quoted 10 lines
recipes-core/gettext/gettext/fix-gl_cv_prog_as_underscore-test.patch deleted +0
-10- 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
Review line 32
Quoted 1 line
(quoted diff) +0
-1-+ if LC_ALL=C grep -E '(^|[^a-zA-Z0-9_])_foo([^a-zA-Z0-9_]|$)'conftest.$gl_asmext >/dev/null; then
recipes-core/gettext/gettext/fix-gl_cv_prog_as_underscore-test.patch
Quoted 13 lines
recipes-core/gettext/gettext/fix-gl_cv_prog_as_underscore-test.patch deleted +0
-13- 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>&1Review line 46
Quoted 1 line
(quoted diff) +0
-1-- if LC_ALL=C grep -E '(^|[^a-zA-Z0-9_])_foo([^a-zA-Z0-9_]|$)'conftest.$gl_asmext >/dev/null; then
Review line 47
Quoted 1 line
(quoted diff) +0
-1-+ if LC_ALL=C grep -E '(^|[[^a-zA-Z0-9_]])_foo([[^a-zA-Z0-9_]]|$)'conftest.$gl_asmext >/dev/null; then
Quoted 4 lines
recipes-core/gettext/gettext/fix-gl_cv_prog_as_underscore-test.patch deleted +0
-4- gl_cv_prog_as_underscore=yes - else - gl_cv_prog_as_underscore=no - firecipes-core/gettext/gettext/fix-gl_cv_prog_as_underscore-test.patch
Quoted 10 lines
recipes-core/gettext/gettext/fix-gl_cv_prog_as_underscore-test.patch deleted +0
-10- 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
Review line 62
Quoted 1 line
(quoted diff) +0
-1-+ if LC_ALL=C grep -E '(^|[^a-zA-Z0-9_])_foo([^a-zA-Z0-9_]|$)'conftest.$gl_asmext >/dev/null; then
Review
Quoted 6 lines
recipes-core/gettext/gettext/fix-gl_cv_prog_as_underscore-test.patch deleted +0
-5- gl_cv_prog_as_underscore=yes - else - gl_cv_prog_as_underscore=no - fi - rm -f conftest*(quoted diff) +0
-0b/recipes-core/gettext/gettext_%.bbappend
Quoted 17 lines
similarity index 87%
rename from recipes-core/gettext/gettext_0.19.%.bbappend rename to recipes-core/gettext/gettext_%.bbappend index 21749f3..d518698 100644recipes-core/gettext/gettext_%.bbappend renamed from recipes-core/gettext/gettext_0.19.%.bbappend +0
-2@@ -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" --2.17.1
Quoted 4 lines
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.View/Reply Online (#47462):
https://lists.yoctoproject.org/g/yocto/message/47462
Quoted 3 lines
Mute This Topic: https://lists.yoctoproject.org/mt/64260047/3616693
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [Quoted 1 line
-=-=-=-=-=-=-=-=-=-=-=-