On Thu, Nov 28, 2019 at 11:47 AM Alexander Kanavin
<alex.kanavin@...> wrote:
>
> 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?

>
> Signed-off-by: Alexander Kanavin <alex.kanavin@...>
> ---
>  .../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%)
>
> 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@...>
> -
> ---- 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
> similarity index 87%
> rename from recipes-core/gettext/gettext_0.19.%.bbappend
> rename to 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"
> --
> 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: yocto+owner@...
> Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub  [JPEWhacker@...]
> -=-=-=-=-=-=-=-=-=-=-=-