[meta-gplv2][PATCH 1/3] grep: fix builds with gettext 0.20.x

[meta-gplv2][PATCH 1/3] grep: fix builds with gettext 0.20.x

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 .../0001-Fix-builds-with-gettext-0.20.patch   | 38 +++++++++++++++++++
 recipes-extended/grep/grep_2.5.1a.bb          |  3 +-
 2 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 recipes-extended/grep/grep-2.5.1a/0001-Fix-builds-with-gettext-0.20.patch

diff --git a/recipes-extended/grep/grep-2.5.1a/0001-Fix-builds-with-gettext-0.20.patch b/recipes-extended/grep/grep-2.5.1a/0001-Fix-builds-with-gettext-0.20.patch
new file mode 100644
index 0000000..a8042eb
--- /dev/null
+++ b/recipes-extended/grep/grep-2.5.1a/0001-Fix-builds-with-gettext-0.20.patch
@@ -0,0 +1,38 @@
+From e11be23d694c8bd4e62252874d163d06b6de3117 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Tue, 17 Dec 2019 16:46:05 +0100
+Subject: [PATCH] Fix builds with gettext 0.20
+
+Upstream-Status: Inappropriate [fixing an old version]
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+---
+ Makefile.am  | 2 +-
+ configure.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index e4b58c4..a851b9d 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,7 +1,7 @@
+ ## Process this file with automake to create Makefile.in
+ AUTOMAKE_OPTIONS = no-dependencies
+ 
+-SUBDIRS = intl po lib doc src tests m4 vms bootstrap
++SUBDIRS = po lib doc src tests m4 vms bootstrap
+ 
+ EXTRA_DIST = TODO README README-alpha PATCHES.AC PATCHES.AM
+ 
+diff --git a/configure.in b/configure.in
+index 2fa6c71..c042a10 100644
+--- a/configure.in
++++ b/configure.in
+@@ -70,7 +70,7 @@ esac
+ 
+ dnl I18N feature
+ ALL_LINGUAS="cs de el eo es et fr gl hr id it ja ko nl no pl pt_BR ru sl sv"
+-AM_GNU_GETTEXT
++AM_GNU_GETTEXT([external])
+ 
+ dnl DOS file name convention
+ dnl sets HAVE_DOS_FILE_NAMES
diff --git a/recipes-extended/grep/grep_2.5.1a.bb b/recipes-extended/grep/grep_2.5.1a.bb
index b331fee..d3b4ddc 100644
--- a/recipes-extended/grep/grep_2.5.1a.bb
+++ b/recipes-extended/grep/grep_2.5.1a.bb
@@ -17,7 +17,8 @@ SRC_URI = "${GNU_MIRROR}/grep/grep-${PV}.tar.bz2 \
            file://fix-for-texinfo-5.1.patch \
            file://grep-egrep-fgrep-Fix-LSB-NG-cases.patch \
            file://search-fix-compilation-error-with-security-flags-ena.patch \
-          "
+           file://0001-Fix-builds-with-gettext-0.20.patch \
+           "
 
 SRC_URI[md5sum] = "52202fe462770fa6be1bb667bd6cf30c"
 SRC_URI[sha256sum] = "38c8a2bb9223d1fb1b10bdd607cf44830afc92fd451ac4cd07619bf92bdd3132"
-- 
2.17.1

[meta-gplv2][PATCH 2/3] mc: fix builds with gettext 0.20

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 ...0001-Fix-builds-wit-the-gettext-0.20.patch | 52 +++++++++++++++++++
 recipes-extended/mc/mc_4.7.5.2.bb             |  1 +
 2 files changed, 53 insertions(+)
 create mode 100644 recipes-extended/mc/mc/0001-Fix-builds-wit-the-gettext-0.20.patch

diff --git a/recipes-extended/mc/mc/0001-Fix-builds-wit-the-gettext-0.20.patch b/recipes-extended/mc/mc/0001-Fix-builds-wit-the-gettext-0.20.patch
new file mode 100644
index 0000000..dbf18ca
--- /dev/null
+++ b/recipes-extended/mc/mc/0001-Fix-builds-wit-the-gettext-0.20.patch
@@ -0,0 +1,52 @@
+From 56aef108be94019c7828c14f0c4849336f811847 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Tue, 17 Dec 2019 16:34:06 +0100
+Subject: [PATCH] Fix builds wit the gettext 0.20
+
+Upstream-Status: Inappropriate [fixing an old version]
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+---
+ Makefile.am     | 2 +-
+ configure.ac    | 2 +-
+ src/Makefile.am | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index ab4f9b7..b27ab4a 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,7 +1,7 @@
+ ## Process this file with automake to create Makefile.in.
+ AUTOMAKE_OPTIONS = 1.5
+ 
+-SUBDIRS = intl po lib src doc contrib misc
++SUBDIRS = po lib src doc contrib misc
+ 
+ EXTRA_DIST = 
+ 
+diff --git a/configure.ac b/configure.ac
+index c05902d..0430714 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -88,7 +88,7 @@ fi
+ dnl
+ dnl Internationalization
+ dnl
+-AM_GNU_GETTEXT(no-libtool, need-ngettext)
++AM_GNU_GETTEXT([external],no-libtool, need-ngettext)
+ AM_GNU_GETTEXT_VERSION(0.14.3)
+ 
+ if test "x$USE_INCLUDED_LIBINTL" = xyes; then
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 2da86c3..1859f0d 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -52,7 +52,7 @@ else
+ mc_LDADD += $(GLIB_LIBS)
+ endif
+ 
+-mc_LDADD += $(PCRE_LIBS) $(LIBICONV) $(INTLLIBS)
++mc_LDADD += $(PCRE_LIBS) $(INTLLIBS)
+ 
+ SRC_mc_conssaver = \
+ 	cons.handler.c consaver/cons.saver.h
diff --git a/recipes-extended/mc/mc_4.7.5.2.bb b/recipes-extended/mc/mc_4.7.5.2.bb
index ca84966..e26bfd9 100644
--- a/recipes-extended/mc/mc_4.7.5.2.bb
+++ b/recipes-extended/mc/mc_4.7.5.2.bb
@@ -11,6 +11,7 @@ PR = "r3"
 SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2 \
            file://mc-CTRL.patch \
            file://0001-disable-Ctrl-g-key-and-Ctrl-key.patch \
+           file://0001-Fix-builds-wit-the-gettext-0.20.patch \
            "
 
 SRC_URI[md5sum] = "bdae966244496cd4f6d282d80c9cf3c6"
-- 
2.17.1

[meta-gplv2][PATCH 3/3] sed: fix builds with gettext 0.20.x

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 .../0001-Fix-builds-with-gettext-0.20.patch   | 38 +++++++++++++++++++
 recipes-extended/sed/sed_4.1.2.bb             |  4 +-
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 recipes-extended/sed/sed-4.1.2/0001-Fix-builds-with-gettext-0.20.patch

diff --git a/recipes-extended/sed/sed-4.1.2/0001-Fix-builds-with-gettext-0.20.patch b/recipes-extended/sed/sed-4.1.2/0001-Fix-builds-with-gettext-0.20.patch
new file mode 100644
index 0000000..e366b5a
--- /dev/null
+++ b/recipes-extended/sed/sed-4.1.2/0001-Fix-builds-with-gettext-0.20.patch
@@ -0,0 +1,38 @@
+From 2792bccbfd41427a79edd462906aba78144b8c6a Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Tue, 17 Dec 2019 16:40:58 +0100
+Subject: [PATCH] Fix builds with gettext 0.20
+
+Upstream-Status: Inappropriate [fixing an old version]
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+---
+ Makefile.am  | 2 +-
+ configure.ac | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index f0aaa7f..1ebc805 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -6,7 +6,7 @@ ACLOCAL_AMFLAGS = -I config
+ 
+ PACKAGE = sed
+ 
+-SUBDIRS = intl lib po sed doc testsuite
++SUBDIRS = lib po sed testsuite
+ 
+ noinst_DATA = bootstrap.sh
+ noinst_HEADERS = basicdefs.h
+diff --git a/configure.ac b/configure.ac
+index e08c9a3..df20044 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -130,7 +130,7 @@ AM_CONDITIONAL(TEXI2HTML_HTML, test "x$enable_html" = xtexi2html)
+ 
+ ALL_LINGUAS="af ca cs da de el eo es et fi fr ga gl he hr hu id it ja ko nl pl pt_BR ro ru sk sl sr sv tr zh_CN"
+ AM_GNU_GETTEXT_VERSION(0.11)
+-AM_GNU_GETTEXT(, need-ngettext)
++AM_GNU_GETTEXT([external], need-ngettext)
+ 
+ AC_CONFIG_FILES([bootstrap.sh], chmod +x bootstrap.sh)
+ AC_CONFIG_FILES([Makefile doc/Makefile \
diff --git a/recipes-extended/sed/sed_4.1.2.bb b/recipes-extended/sed/sed_4.1.2.bb
index 40e3a53..4a58442 100644
--- a/recipes-extended/sed/sed_4.1.2.bb
+++ b/recipes-extended/sed/sed_4.1.2.bb
@@ -9,7 +9,9 @@ PR = "r7"
 SRC_URI = "${GNU_MIRROR}/sed/sed-${PV}.tar.gz \
            file://fix_return_type.patch \
            file://sed-4.1.2_fix_for_automake-1.12.patch \
-           file://Makevars"
+           file://Makevars \
+           file://0001-Fix-builds-with-gettext-0.20.patch \
+           "
 
 SRC_URI[md5sum] = "928f0e06422f414091917401f1a834d0"
 SRC_URI[sha256sum] = "638e837ba765d5da0a30c98b57c2953cecea96827882f594612acace93ceeeab"
-- 
2.17.1

Re: [yocto] [meta-gplv2][PATCH 1/3] grep: fix builds with gettext 0.20.x

[Andr? Draszik]

Hi,

On Tue, 2019-12-17 at 16:59 +0100, Alexander Kanavin wrote:
> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>

This patch looks to be missing something (using musl here):

../../grep-2.5.1a/src/dfa.c: In function 'dfaparse':
../../grep-2.5.1a/src/dfa.c:1366:34: error: 'LC_COLLATE' undeclared (first use in this function); did you mean
'REG_ECOLLATE'?
 1366 |   hard_LC_COLLATE = hard_locale (LC_COLLATE);
      |                                  ^~~~~~~~~~
      |                                  REG_ECOLLATE
../../grep-2.5.1a/src/dfa.c:1366:34: note: each undeclared identifier is reported only once for each function it appears
in
chmod a+x fgrep
make[2]: *** [Makefile:448: dfa.o] Error 1
make[2]: *** Waiting for unfinished jobs....


I might have a look next week, unless somebody else beats me to it...

Cheers,
Andre'



> ---
>  .../0001-Fix-builds-with-gettext-0.20.patch   | 38 +++++++++++++++++++
>  recipes-extended/grep/grep_2.5.1a.bb          |  3 +-
>  2 files changed, 40 insertions(+), 1 deletion(-)
>  create mode 100644 recipes-extended/grep/grep-2.5.1a/0001-Fix-builds-with-gettext-0.20.patch
> 
> diff --git a/recipes-extended/grep/grep-2.5.1a/0001-Fix-builds-with-gettext-0.20.patch b/recipes-extended/grep/grep-
> 2.5.1a/0001-Fix-builds-with-gettext-0.20.patch
> new file mode 100644
> index 0000000..a8042eb
> --- /dev/null
> +++ b/recipes-extended/grep/grep-2.5.1a/0001-Fix-builds-with-gettext-0.20.patch
> @@ -0,0 +1,38 @@
> +From e11be23d694c8bd4e62252874d163d06b6de3117 Mon Sep 17 00:00:00 2001
> +From: Alexander Kanavin <alex.kanavin@gmail.com>
> +Date: Tue, 17 Dec 2019 16:46:05 +0100
> +Subject: [PATCH] Fix builds with gettext 0.20
> +
> +Upstream-Status: Inappropriate [fixing an old version]
> +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> +---
> + Makefile.am  | 2 +-
> + configure.in | 2 +-
> + 2 files changed, 2 insertions(+), 2 deletions(-)
> +
> +diff --git a/Makefile.am b/Makefile.am
> +index e4b58c4..a851b9d 100644
> +--- a/Makefile.am
> ++++ b/Makefile.am
> +@@ -1,7 +1,7 @@
> + ## Process this file with automake to create Makefile.in
> + AUTOMAKE_OPTIONS = no-dependencies
> + 
> +-SUBDIRS = intl po lib doc src tests m4 vms bootstrap
> ++SUBDIRS = po lib doc src tests m4 vms bootstrap
> + 
> + EXTRA_DIST = TODO README README-alpha PATCHES.AC PATCHES.AM
> + 
> +diff --git a/configure.in b/configure.in
> +index 2fa6c71..c042a10 100644
> +--- a/configure.in
> ++++ b/configure.in
> +@@ -70,7 +70,7 @@ esac
> + 
> + dnl I18N feature
> + ALL_LINGUAS="cs de el eo es et fr gl hr id it ja ko nl no pl pt_BR ru sl sv"
> +-AM_GNU_GETTEXT
> ++AM_GNU_GETTEXT([external])
> + 
> + dnl DOS file name convention
> + dnl sets HAVE_DOS_FILE_NAMES
> diff --git a/recipes-extended/grep/grep_2.5.1a.bb b/recipes-extended/grep/grep_2.5.1a.bb
> index b331fee..d3b4ddc 100644
> --- a/recipes-extended/grep/grep_2.5.1a.bb
> +++ b/recipes-extended/grep/grep_2.5.1a.bb
> @@ -17,7 +17,8 @@ SRC_URI = "${GNU_MIRROR}/grep/grep-${PV}.tar.bz2 \
>             file://fix-for-texinfo-5.1.patch \
>             file://grep-egrep-fgrep-Fix-LSB-NG-cases.patch \
>             file://search-fix-compilation-error-with-security-flags-ena.patch \
> -          "
> +           file://0001-Fix-builds-with-gettext-0.20.patch \
> +           "
>  
>  SRC_URI[md5sum] = "52202fe462770fa6be1bb667bd6cf30c"
>  SRC_URI[sha256sum] = "38c8a2bb9223d1fb1b10bdd607cf44830afc92fd451ac4cd07619bf92bdd3132"
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> 
> View/Reply Online (#47731): https://lists.yoctoproject.org/g/yocto/message/47731
> Mute This Topic: https://lists.yoctoproject.org/mt/68764156/3617338
> Group Owner: yocto+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub  [git@andred.net]
> -=-=-=-=-=-=-=-=-=-=-=-