| Message ID | 20230906165633.2382629-2-alex@linutronix.de |
|---|---|
| State | Accepted, archived |
| Commit | 7c29196f8e378cb12b82da31ab2a05f5e8d1b831 |
| Headers | show |
| Series | [01/17] openssl: build and install manpages only if they are enabled | expand |
fontforge fails due to this see - https://autobuilder.yoctoproject.org/typhoon/#/builders/88/builds/3095/steps/15/logs/stdio cd /mnt/b/yoe/master/build/tmp/work/x86_64-linux/fontforge-native/20230101/build/po && /mnt/b/yoe/master/build/tmp/work/x86_64-linux/fontforge-native/20230101/recipe-sysroot-native/usr/bin/msgfmt --check -o /mnt/b/yoe/master/build/tmp/work/x86_64-linux/fontforge-native/20230101/build/po/fr.mo /mnt/b/yoe/master/build/tmp/work/x86_64-linux/fontforge-native/20230101/git/po/fr.po /mnt/b/yoe/master/build/tmp/work/x86_64-linux/fontforge-native/20230101/git/po/fr.po:294: 'msgstr' is not a valid C format string, unlike 'msgid'. Reason: In the directive number 3, the argument size specifier is invalid. /mnt/b/yoe/master/build/tmp/work/x86_64-linux/fontforge-native/20230101/git/po/fr.po:305: 'msgstr' is not a valid C format string, unlike 'msgid'. Reason: In the directive number 4, the argument size specifier is invalid. /mnt/b/yoe/master/build/tmp/work/x86_64-linux/fontforge-native/20230101/git/po/fr.po:7435: 'msgstr' is not a valid C format string, unlike 'msgid'. Reason: In the directive number 2, the argument size specifier is invalid. /mnt/b/yoe/master/build/tmp/work/x86_64-linux/fontforge-native/20230101/git/po/fr.po:19927: 'msgstr' is not a valid C format string, unlike 'msgid'. Reason: In the directive number 2, the argument size specifier is invalid. /mnt/b/yoe/master/build/tmp/work/x86_64-linux/fontforge-native/20230101/git/po/fr.po:19935: 'msgstr' is not a valid C format string, unlike 'msgid'. Reason: In the directive number 2, the argument size specifier is invalid. /mnt/b/yoe/master/build/tmp/work/x86_64-linux/fontforge-native/20230101/git/po/fr.po:19970: 'msgstr' is not a valid C format string, unlike 'msgid'. Reason: In the directive number 2, the argument size specifier is invalid. /mnt/b/yoe/master/build/tmp/work/x86_64-linux/fontforge-native/20230101/git/po/fr.po:19986: 'msgstr' is not a valid C format string, unlike 'msgid'. Reason: In the directive number 2, the argument size specifier is invalid. /mnt/b/yoe/master/build/tmp/work/x86_64-linux/fontforge-native/20230101/git/po/fr.po:20459: 'msgstr' is not a valid C format string, unlike 'msgid'. Reason: In the directive number 2, the argument size specifier is invalid. /mnt/b/yoe/master/build/tmp/work/x86_64-linux/fontforge-native/20230101/git/po/fr.po:21045: 'msgstr' is not a valid C format string, unlike 'msgid'. Reason: In the directive number 2, the argument size specifier is invalid. /mnt/b/yoe/master/build/tmp/work/x86_64-linux/fontforge-native/20230101/git/po/fr.po:21443: 'msgstr' is not a valid C format string, unlike 'msgid'. Reason: In the directive number 2, the argument size specifier is invalid. /mnt/b/yoe/master/build/tmp/work/x86_64-linux/fontforge-native/20230101/git/po/fr.po:21772: 'msgstr' is not a valid C format string, unlike 'msgid'. Reason: In the directive number 2, the argument size specifier is invalid. /mnt/b/yoe/master/build/tmp/work/x86_64-linux/fontforge-native/20230101/git/po/fr.po:24553: 'msgstr' is not a valid C format string, unlike 'msgid'. Reason: In the directive number 2, the argument size specifier is invalid. /mnt/b/yoe/master/build/tmp/work/x86_64-linux/fontforge-native/20230101/git/po/fr.po:24564: 'msgstr' is not a valid C format string, unlike 'msgid'. Reason: In the directive number 2, the argument size specifier is invalid. /mnt/b/yoe/master/build/tmp/work/x86_64-linux/fontforge-native/20230101/recipe-sysroot-native/usr/bin/msgfmt: found 13 fatal errors On Wed, Sep 6, 2023 at 9:56 AM Alexander Kanavin <alex.kanavin@gmail.com> wrote: > > Drop autoconf-2.73.patch as upstream did update the gnulib. > > Signed-off-by: Alexander Kanavin <alex@linutronix.de> > --- > .../gettext-0.21.1/autoconf-2.73.patch | 50 ------------------- > ...21.1.bb => gettext-minimal-native_0.22.bb} | 0 > .../COPYING | 0 > meta/recipes-core/gettext/gettext-sources.inc | 2 +- > ...t-env.in-do-not-add-C-CXX-parameters.patch | 0 > ...01-tests-autopoint-3-unset-MAKEFLAGS.patch | 0 > .../parallel.patch | 0 > .../{gettext-0.21.1 => gettext}/run-ptest | 0 > .../serial-tests-config.patch | 0 > .../use-pkgconfig.patch | 0 > .../{gettext_0.21.1.bb => gettext_0.22.bb} | 3 +- > 11 files changed, 3 insertions(+), 52 deletions(-) > delete mode 100644 meta/recipes-core/gettext/gettext-0.21.1/autoconf-2.73.patch > rename meta/recipes-core/gettext/{gettext-minimal-native_0.21.1.bb => gettext-minimal-native_0.22.bb} (100%) > rename meta/recipes-core/gettext/{gettext-minimal-0.21.1 => gettext-minimal}/COPYING (100%) > rename meta/recipes-core/gettext/{gettext-0.21.1 => gettext}/0001-init-env.in-do-not-add-C-CXX-parameters.patch (100%) > rename meta/recipes-core/gettext/{gettext-0.21.1 => gettext}/0001-tests-autopoint-3-unset-MAKEFLAGS.patch (100%) > rename meta/recipes-core/gettext/{gettext-0.21.1 => gettext}/parallel.patch (100%) > rename meta/recipes-core/gettext/{gettext-0.21.1 => gettext}/run-ptest (100%) > rename meta/recipes-core/gettext/{gettext-0.21.1 => gettext}/serial-tests-config.patch (100%) > rename meta/recipes-core/gettext/{gettext-0.21.1 => gettext}/use-pkgconfig.patch (100%) > rename meta/recipes-core/gettext/{gettext_0.21.1.bb => gettext_0.22.bb} (99%) > > diff --git a/meta/recipes-core/gettext/gettext-0.21.1/autoconf-2.73.patch b/meta/recipes-core/gettext/gettext-0.21.1/autoconf-2.73.patch > deleted file mode 100644 > index ae5b2491bb8..00000000000 > --- a/meta/recipes-core/gettext/gettext-0.21.1/autoconf-2.73.patch > +++ /dev/null > @@ -1,50 +0,0 @@ > -The gnulib largefile macro needs updating to work with autoconf 2.73. Rather > -than the full code: > - > -https://git.savannah.gnu.org/cgit/gnulib.git/commit/m4/largefile.m4?id=f91f633858cf132e50924224c50d6264a92caabb > - > -Just tweak the exiting code to work with 2.73. The next gettext upgrade should > -update to new gnulib > - > -Upstream-Status: Inappropriate > -Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> > - > -Index: gettext-0.21.1/gettext-runtime/gnulib-m4/largefile.m4 > -=================================================================== > ---- gettext-0.21.1.orig/gettext-runtime/gnulib-m4/largefile.m4 > -+++ gettext-0.21.1/gettext-runtime/gnulib-m4/largefile.m4 > -@@ -26,7 +26,7 @@ AC_DEFUN([gl_SET_LARGEFILE_SOURCE], > - # with _TIME_BITS. Also, work around a problem in autoconf <= 2.69: > - # AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5, > - # or configures them incorrectly in some cases. > --m4_version_prereq([2.70], [], [ > -+m4_version_prereq([2.73], [], [ > - > - # _AC_SYS_LARGEFILE_TEST_INCLUDES > - # ------------------------------- > -Index: gettext-0.21.1/gettext-tools/gnulib-m4/largefile.m4 > -=================================================================== > ---- gettext-0.21.1.orig/gettext-tools/gnulib-m4/largefile.m4 > -+++ gettext-0.21.1/gettext-tools/gnulib-m4/largefile.m4 > -@@ -26,7 +26,7 @@ AC_DEFUN([gl_SET_LARGEFILE_SOURCE], > - # with _TIME_BITS. Also, work around a problem in autoconf <= 2.69: > - # AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5, > - # or configures them incorrectly in some cases. > --m4_version_prereq([2.70], [], [ > -+m4_version_prereq([2.73], [], [ > - > - # _AC_SYS_LARGEFILE_TEST_INCLUDES > - # ------------------------------- > -Index: gettext-0.21.1/libtextstyle/gnulib-m4/largefile.m4 > -=================================================================== > ---- gettext-0.21.1.orig/libtextstyle/gnulib-m4/largefile.m4 > -+++ gettext-0.21.1/libtextstyle/gnulib-m4/largefile.m4 > -@@ -26,7 +26,7 @@ AC_DEFUN([gl_SET_LARGEFILE_SOURCE], > - # with _TIME_BITS. Also, work around a problem in autoconf <= 2.69: > - # AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5, > - # or configures them incorrectly in some cases. > --m4_version_prereq([2.70], [], [ > -+m4_version_prereq([2.73], [], [ > - > - # _AC_SYS_LARGEFILE_TEST_INCLUDES > - # ------------------------------- > diff --git a/meta/recipes-core/gettext/gettext-minimal-native_0.21.1.bb b/meta/recipes-core/gettext/gettext-minimal-native_0.22.bb > similarity index 100% > rename from meta/recipes-core/gettext/gettext-minimal-native_0.21.1.bb > rename to meta/recipes-core/gettext/gettext-minimal-native_0.22.bb > diff --git a/meta/recipes-core/gettext/gettext-minimal-0.21.1/COPYING b/meta/recipes-core/gettext/gettext-minimal/COPYING > similarity index 100% > rename from meta/recipes-core/gettext/gettext-minimal-0.21.1/COPYING > rename to meta/recipes-core/gettext/gettext-minimal/COPYING > diff --git a/meta/recipes-core/gettext/gettext-sources.inc b/meta/recipes-core/gettext/gettext-sources.inc > index da2860fbc85..b4fb6479161 100644 > --- a/meta/recipes-core/gettext/gettext-sources.inc > +++ b/meta/recipes-core/gettext/gettext-sources.inc > @@ -1,4 +1,4 @@ > HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html" > SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ > " > -SRC_URI[sha256sum] = "e8c3650e1d8cee875c4f355642382c1df83058bd5a11ee8555c0cf276d646d45" > +SRC_URI[sha256sum] = "49f089be11b490170bbf09ed2f51e5f5177f55be4cc66504a5861820e0fb06ab" > diff --git a/meta/recipes-core/gettext/gettext-0.21.1/0001-init-env.in-do-not-add-C-CXX-parameters.patch b/meta/recipes-core/gettext/gettext/0001-init-env.in-do-not-add-C-CXX-parameters.patch > similarity index 100% > rename from meta/recipes-core/gettext/gettext-0.21.1/0001-init-env.in-do-not-add-C-CXX-parameters.patch > rename to meta/recipes-core/gettext/gettext/0001-init-env.in-do-not-add-C-CXX-parameters.patch > diff --git a/meta/recipes-core/gettext/gettext-0.21.1/0001-tests-autopoint-3-unset-MAKEFLAGS.patch b/meta/recipes-core/gettext/gettext/0001-tests-autopoint-3-unset-MAKEFLAGS.patch > similarity index 100% > rename from meta/recipes-core/gettext/gettext-0.21.1/0001-tests-autopoint-3-unset-MAKEFLAGS.patch > rename to meta/recipes-core/gettext/gettext/0001-tests-autopoint-3-unset-MAKEFLAGS.patch > diff --git a/meta/recipes-core/gettext/gettext-0.21.1/parallel.patch b/meta/recipes-core/gettext/gettext/parallel.patch > similarity index 100% > rename from meta/recipes-core/gettext/gettext-0.21.1/parallel.patch > rename to meta/recipes-core/gettext/gettext/parallel.patch > diff --git a/meta/recipes-core/gettext/gettext-0.21.1/run-ptest b/meta/recipes-core/gettext/gettext/run-ptest > similarity index 100% > rename from meta/recipes-core/gettext/gettext-0.21.1/run-ptest > rename to meta/recipes-core/gettext/gettext/run-ptest > diff --git a/meta/recipes-core/gettext/gettext-0.21.1/serial-tests-config.patch b/meta/recipes-core/gettext/gettext/serial-tests-config.patch > similarity index 100% > rename from meta/recipes-core/gettext/gettext-0.21.1/serial-tests-config.patch > rename to meta/recipes-core/gettext/gettext/serial-tests-config.patch > diff --git a/meta/recipes-core/gettext/gettext-0.21.1/use-pkgconfig.patch b/meta/recipes-core/gettext/gettext/use-pkgconfig.patch > similarity index 100% > rename from meta/recipes-core/gettext/gettext-0.21.1/use-pkgconfig.patch > rename to meta/recipes-core/gettext/gettext/use-pkgconfig.patch > diff --git a/meta/recipes-core/gettext/gettext_0.21.1.bb b/meta/recipes-core/gettext/gettext_0.22.bb > similarity index 99% > rename from meta/recipes-core/gettext/gettext_0.21.1.bb > rename to meta/recipes-core/gettext/gettext_0.22.bb > index a3eb3bba541..71e84521b0d 100644 > --- a/meta/recipes-core/gettext/gettext_0.21.1.bb > +++ b/meta/recipes-core/gettext/gettext_0.22.bb > @@ -30,7 +30,6 @@ SRC_URI += " \ > file://serial-tests-config.patch \ > file://0001-tests-autopoint-3-unset-MAKEFLAGS.patch \ > file://0001-init-env.in-do-not-add-C-CXX-parameters.patch \ > - file://autoconf-2.73.patch \ > " > > inherit autotools texinfo pkgconfig ptest > @@ -201,6 +200,8 @@ RDEPENDS:${PN}-ptest:append:libc-glibc = "\ > glibc-charmap-euc-kr \ > glibc-gconv-euc-jp \ > glibc-charmap-euc-jp \ > + glibc-gconv-gb18030 \ > + glibc-charmap-gb18030 \ > locale-base-de-de \ > locale-base-fr-fr \ > " > -- > 2.30.2 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#187324): https://lists.openembedded.org/g/openembedded-core/message/187324 > Mute This Topic: https://lists.openembedded.org/mt/101197336/1997914 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [raj.khem@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
Probably same issue as https://git.yoctoproject.org/poky/tree/meta/recipes-extended/procps/procps/0001-po-fr.po-address-failures-with-gettext-0.22.patch ? Alex On Thu, 7 Sept 2023 at 21:12, Khem Raj <raj.khem@gmail.com> wrote: > > fontforge fails due to this see - > https://autobuilder.yoctoproject.org/typhoon/#/builders/88/builds/3095/steps/15/logs/stdio > > cd /mnt/b/yoe/master/build/tmp/work/x86_64-linux/fontforge-native/20230101/build/po > && /mnt/b/yoe/master/build/tmp/work/x86_64-linux/fontforge-native/20230101/recipe-sysroot-native/usr/bin/msgfmt > --check -o /mnt/b/yoe/master/build/tmp/work/x86_64-linux/fontforge-native/20230101/build/po/fr.mo > /mnt/b/yoe/master/build/tmp/work/x86_64-linux/fontforge-native/20230101/git/po/fr.po > /mnt/b/yoe/master/build/tmp/work/x86_64-linux/fontforge-native/20230101/git/po/fr.po:294: > 'msgstr' is not a valid C format string, unlike 'msgid'. Reason: In > the directive number 3, the argument size specifier is invalid. > /mnt/b/yoe/master/build/tmp/work/x86_64-linux/fontforge-native/20230101/git/po/fr.po:305: > 'msgstr' is not a valid C format string, unlike 'msgid'. Reason: In > the directive number 4, the argument size specifier is invalid. > /mnt/b/yoe/master/build/tmp/work/x86_64-linux/fontforge-native/20230101/git/po/fr.po:7435: > 'msgstr' is not a valid C format string, unlike 'msgid'. Reason: In > the directive number 2, the argument size specifier is invalid. > /mnt/b/yoe/master/build/tmp/work/x86_64-linux/fontforge-native/20230101/git/po/fr.po:19927: > 'msgstr' is not a valid C format string, unlike 'msgid'. Reason: In > the directive number 2, the argument size specifier is invalid. > /mnt/b/yoe/master/build/tmp/work/x86_64-linux/fontforge-native/20230101/git/po/fr.po:19935: > 'msgstr' is not a valid C format string, unlike 'msgid'. Reason: In > the directive number 2, the argument size specifier is invalid. > /mnt/b/yoe/master/build/tmp/work/x86_64-linux/fontforge-native/20230101/git/po/fr.po:19970: > 'msgstr' is not a valid C format string, unlike 'msgid'. Reason: In > the directive number 2, the argument size specifier is invalid. > /mnt/b/yoe/master/build/tmp/work/x86_64-linux/fontforge-native/20230101/git/po/fr.po:19986: > 'msgstr' is not a valid C format string, unlike 'msgid'. Reason: In > the directive number 2, the argument size specifier is invalid. > /mnt/b/yoe/master/build/tmp/work/x86_64-linux/fontforge-native/20230101/git/po/fr.po:20459: > 'msgstr' is not a valid C format string, unlike 'msgid'. Reason: In > the directive number 2, the argument size specifier is invalid. > /mnt/b/yoe/master/build/tmp/work/x86_64-linux/fontforge-native/20230101/git/po/fr.po:21045: > 'msgstr' is not a valid C format string, unlike 'msgid'. Reason: In > the directive number 2, the argument size specifier is invalid. > /mnt/b/yoe/master/build/tmp/work/x86_64-linux/fontforge-native/20230101/git/po/fr.po:21443: > 'msgstr' is not a valid C format string, unlike 'msgid'. Reason: In > the directive number 2, the argument size specifier is invalid. > /mnt/b/yoe/master/build/tmp/work/x86_64-linux/fontforge-native/20230101/git/po/fr.po:21772: > 'msgstr' is not a valid C format string, unlike 'msgid'. Reason: In > the directive number 2, the argument size specifier is invalid. > /mnt/b/yoe/master/build/tmp/work/x86_64-linux/fontforge-native/20230101/git/po/fr.po:24553: > 'msgstr' is not a valid C format string, unlike 'msgid'. Reason: In > the directive number 2, the argument size specifier is invalid. > /mnt/b/yoe/master/build/tmp/work/x86_64-linux/fontforge-native/20230101/git/po/fr.po:24564: > 'msgstr' is not a valid C format string, unlike 'msgid'. Reason: In > the directive number 2, the argument size specifier is invalid. > /mnt/b/yoe/master/build/tmp/work/x86_64-linux/fontforge-native/20230101/recipe-sysroot-native/usr/bin/msgfmt: > found 13 fatal errors > > On Wed, Sep 6, 2023 at 9:56 AM Alexander Kanavin <alex.kanavin@gmail.com> wrote: > > > > Drop autoconf-2.73.patch as upstream did update the gnulib. > > > > Signed-off-by: Alexander Kanavin <alex@linutronix.de> > > --- > > .../gettext-0.21.1/autoconf-2.73.patch | 50 ------------------- > > ...21.1.bb => gettext-minimal-native_0.22.bb} | 0 > > .../COPYING | 0 > > meta/recipes-core/gettext/gettext-sources.inc | 2 +- > > ...t-env.in-do-not-add-C-CXX-parameters.patch | 0 > > ...01-tests-autopoint-3-unset-MAKEFLAGS.patch | 0 > > .../parallel.patch | 0 > > .../{gettext-0.21.1 => gettext}/run-ptest | 0 > > .../serial-tests-config.patch | 0 > > .../use-pkgconfig.patch | 0 > > .../{gettext_0.21.1.bb => gettext_0.22.bb} | 3 +- > > 11 files changed, 3 insertions(+), 52 deletions(-) > > delete mode 100644 meta/recipes-core/gettext/gettext-0.21.1/autoconf-2.73.patch > > rename meta/recipes-core/gettext/{gettext-minimal-native_0.21.1.bb => gettext-minimal-native_0.22.bb} (100%) > > rename meta/recipes-core/gettext/{gettext-minimal-0.21.1 => gettext-minimal}/COPYING (100%) > > rename meta/recipes-core/gettext/{gettext-0.21.1 => gettext}/0001-init-env.in-do-not-add-C-CXX-parameters.patch (100%) > > rename meta/recipes-core/gettext/{gettext-0.21.1 => gettext}/0001-tests-autopoint-3-unset-MAKEFLAGS.patch (100%) > > rename meta/recipes-core/gettext/{gettext-0.21.1 => gettext}/parallel.patch (100%) > > rename meta/recipes-core/gettext/{gettext-0.21.1 => gettext}/run-ptest (100%) > > rename meta/recipes-core/gettext/{gettext-0.21.1 => gettext}/serial-tests-config.patch (100%) > > rename meta/recipes-core/gettext/{gettext-0.21.1 => gettext}/use-pkgconfig.patch (100%) > > rename meta/recipes-core/gettext/{gettext_0.21.1.bb => gettext_0.22.bb} (99%) > > > > diff --git a/meta/recipes-core/gettext/gettext-0.21.1/autoconf-2.73.patch b/meta/recipes-core/gettext/gettext-0.21.1/autoconf-2.73.patch > > deleted file mode 100644 > > index ae5b2491bb8..00000000000 > > --- a/meta/recipes-core/gettext/gettext-0.21.1/autoconf-2.73.patch > > +++ /dev/null > > @@ -1,50 +0,0 @@ > > -The gnulib largefile macro needs updating to work with autoconf 2.73. Rather > > -than the full code: > > - > > -https://git.savannah.gnu.org/cgit/gnulib.git/commit/m4/largefile.m4?id=f91f633858cf132e50924224c50d6264a92caabb > > - > > -Just tweak the exiting code to work with 2.73. The next gettext upgrade should > > -update to new gnulib > > - > > -Upstream-Status: Inappropriate > > -Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> > > - > > -Index: gettext-0.21.1/gettext-runtime/gnulib-m4/largefile.m4 > > -=================================================================== > > ---- gettext-0.21.1.orig/gettext-runtime/gnulib-m4/largefile.m4 > > -+++ gettext-0.21.1/gettext-runtime/gnulib-m4/largefile.m4 > > -@@ -26,7 +26,7 @@ AC_DEFUN([gl_SET_LARGEFILE_SOURCE], > > - # with _TIME_BITS. Also, work around a problem in autoconf <= 2.69: > > - # AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5, > > - # or configures them incorrectly in some cases. > > --m4_version_prereq([2.70], [], [ > > -+m4_version_prereq([2.73], [], [ > > - > > - # _AC_SYS_LARGEFILE_TEST_INCLUDES > > - # ------------------------------- > > -Index: gettext-0.21.1/gettext-tools/gnulib-m4/largefile.m4 > > -=================================================================== > > ---- gettext-0.21.1.orig/gettext-tools/gnulib-m4/largefile.m4 > > -+++ gettext-0.21.1/gettext-tools/gnulib-m4/largefile.m4 > > -@@ -26,7 +26,7 @@ AC_DEFUN([gl_SET_LARGEFILE_SOURCE], > > - # with _TIME_BITS. Also, work around a problem in autoconf <= 2.69: > > - # AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5, > > - # or configures them incorrectly in some cases. > > --m4_version_prereq([2.70], [], [ > > -+m4_version_prereq([2.73], [], [ > > - > > - # _AC_SYS_LARGEFILE_TEST_INCLUDES > > - # ------------------------------- > > -Index: gettext-0.21.1/libtextstyle/gnulib-m4/largefile.m4 > > -=================================================================== > > ---- gettext-0.21.1.orig/libtextstyle/gnulib-m4/largefile.m4 > > -+++ gettext-0.21.1/libtextstyle/gnulib-m4/largefile.m4 > > -@@ -26,7 +26,7 @@ AC_DEFUN([gl_SET_LARGEFILE_SOURCE], > > - # with _TIME_BITS. Also, work around a problem in autoconf <= 2.69: > > - # AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5, > > - # or configures them incorrectly in some cases. > > --m4_version_prereq([2.70], [], [ > > -+m4_version_prereq([2.73], [], [ > > - > > - # _AC_SYS_LARGEFILE_TEST_INCLUDES > > - # ------------------------------- > > diff --git a/meta/recipes-core/gettext/gettext-minimal-native_0.21.1.bb b/meta/recipes-core/gettext/gettext-minimal-native_0.22.bb > > similarity index 100% > > rename from meta/recipes-core/gettext/gettext-minimal-native_0.21.1.bb > > rename to meta/recipes-core/gettext/gettext-minimal-native_0.22.bb > > diff --git a/meta/recipes-core/gettext/gettext-minimal-0.21.1/COPYING b/meta/recipes-core/gettext/gettext-minimal/COPYING > > similarity index 100% > > rename from meta/recipes-core/gettext/gettext-minimal-0.21.1/COPYING > > rename to meta/recipes-core/gettext/gettext-minimal/COPYING > > diff --git a/meta/recipes-core/gettext/gettext-sources.inc b/meta/recipes-core/gettext/gettext-sources.inc > > index da2860fbc85..b4fb6479161 100644 > > --- a/meta/recipes-core/gettext/gettext-sources.inc > > +++ b/meta/recipes-core/gettext/gettext-sources.inc > > @@ -1,4 +1,4 @@ > > HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html" > > SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ > > " > > -SRC_URI[sha256sum] = "e8c3650e1d8cee875c4f355642382c1df83058bd5a11ee8555c0cf276d646d45" > > +SRC_URI[sha256sum] = "49f089be11b490170bbf09ed2f51e5f5177f55be4cc66504a5861820e0fb06ab" > > diff --git a/meta/recipes-core/gettext/gettext-0.21.1/0001-init-env.in-do-not-add-C-CXX-parameters.patch b/meta/recipes-core/gettext/gettext/0001-init-env.in-do-not-add-C-CXX-parameters.patch > > similarity index 100% > > rename from meta/recipes-core/gettext/gettext-0.21.1/0001-init-env.in-do-not-add-C-CXX-parameters.patch > > rename to meta/recipes-core/gettext/gettext/0001-init-env.in-do-not-add-C-CXX-parameters.patch > > diff --git a/meta/recipes-core/gettext/gettext-0.21.1/0001-tests-autopoint-3-unset-MAKEFLAGS.patch b/meta/recipes-core/gettext/gettext/0001-tests-autopoint-3-unset-MAKEFLAGS.patch > > similarity index 100% > > rename from meta/recipes-core/gettext/gettext-0.21.1/0001-tests-autopoint-3-unset-MAKEFLAGS.patch > > rename to meta/recipes-core/gettext/gettext/0001-tests-autopoint-3-unset-MAKEFLAGS.patch > > diff --git a/meta/recipes-core/gettext/gettext-0.21.1/parallel.patch b/meta/recipes-core/gettext/gettext/parallel.patch > > similarity index 100% > > rename from meta/recipes-core/gettext/gettext-0.21.1/parallel.patch > > rename to meta/recipes-core/gettext/gettext/parallel.patch > > diff --git a/meta/recipes-core/gettext/gettext-0.21.1/run-ptest b/meta/recipes-core/gettext/gettext/run-ptest > > similarity index 100% > > rename from meta/recipes-core/gettext/gettext-0.21.1/run-ptest > > rename to meta/recipes-core/gettext/gettext/run-ptest > > diff --git a/meta/recipes-core/gettext/gettext-0.21.1/serial-tests-config.patch b/meta/recipes-core/gettext/gettext/serial-tests-config.patch > > similarity index 100% > > rename from meta/recipes-core/gettext/gettext-0.21.1/serial-tests-config.patch > > rename to meta/recipes-core/gettext/gettext/serial-tests-config.patch > > diff --git a/meta/recipes-core/gettext/gettext-0.21.1/use-pkgconfig.patch b/meta/recipes-core/gettext/gettext/use-pkgconfig.patch > > similarity index 100% > > rename from meta/recipes-core/gettext/gettext-0.21.1/use-pkgconfig.patch > > rename to meta/recipes-core/gettext/gettext/use-pkgconfig.patch > > diff --git a/meta/recipes-core/gettext/gettext_0.21.1.bb b/meta/recipes-core/gettext/gettext_0.22.bb > > similarity index 99% > > rename from meta/recipes-core/gettext/gettext_0.21.1.bb > > rename to meta/recipes-core/gettext/gettext_0.22.bb > > index a3eb3bba541..71e84521b0d 100644 > > --- a/meta/recipes-core/gettext/gettext_0.21.1.bb > > +++ b/meta/recipes-core/gettext/gettext_0.22.bb > > @@ -30,7 +30,6 @@ SRC_URI += " \ > > file://serial-tests-config.patch \ > > file://0001-tests-autopoint-3-unset-MAKEFLAGS.patch \ > > file://0001-init-env.in-do-not-add-C-CXX-parameters.patch \ > > - file://autoconf-2.73.patch \ > > " > > > > inherit autotools texinfo pkgconfig ptest > > @@ -201,6 +200,8 @@ RDEPENDS:${PN}-ptest:append:libc-glibc = "\ > > glibc-charmap-euc-kr \ > > glibc-gconv-euc-jp \ > > glibc-charmap-euc-jp \ > > + glibc-gconv-gb18030 \ > > + glibc-charmap-gb18030 \ > > locale-base-de-de \ > > locale-base-fr-fr \ > > " > > -- > > 2.30.2 > > > > > > -=-=-=-=-=-=-=-=-=-=-=- > > Links: You receive all messages sent to this group. > > View/Reply Online (#187324): https://lists.openembedded.org/g/openembedded-core/message/187324 > > Mute This Topic: https://lists.openembedded.org/mt/101197336/1997914 > > Group Owner: openembedded-core+owner@lists.openembedded.org > > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [raj.khem@gmail.com] > > -=-=-=-=-=-=-=-=-=-=-=- > >
On Thu, Sep 7, 2023 at 12:58 PM Alexander Kanavin <alex.kanavin@gmail.com> wrote: > Probably same issue as > > https://git.yoctoproject.org/poky/tree/meta/recipes-extended/procps/procps/0001-po-fr.po-address-failures-with-gettext-0.22.patch > ? > Yeah I have sent a patch to fix this. IMO it would be good to excercise mera-oe AB job to catch such issues with version upgrade series so we know what needs work on other layers > > Alex > > On Thu, 7 Sept 2023 at 21:12, Khem Raj <raj.khem@gmail.com> wrote: > > > > fontforge fails due to this see - > > > https://autobuilder.yoctoproject.org/typhoon/#/builders/88/builds/3095/steps/15/logs/stdio > > > > cd > /mnt/b/yoe/master/build/tmp/work/x86_64-linux/fontforge-native/20230101/build/po > > && > /mnt/b/yoe/master/build/tmp/work/x86_64-linux/fontforge-native/20230101/recipe-sysroot-native/usr/bin/msgfmt > > --check -o > /mnt/b/yoe/master/build/tmp/work/x86_64-linux/fontforge-native/20230101/build/po/fr.mo > > > /mnt/b/yoe/master/build/tmp/work/x86_64-linux/fontforge-native/20230101/git/po/fr.po > > > /mnt/b/yoe/master/build/tmp/work/x86_64-linux/fontforge-native/20230101/git/po/fr.po:294: > > 'msgstr' is not a valid C format string, unlike 'msgid'. Reason: In > > the directive number 3, the argument size specifier is invalid. > > > /mnt/b/yoe/master/build/tmp/work/x86_64-linux/fontforge-native/20230101/git/po/fr.po:305: > > 'msgstr' is not a valid C format string, unlike 'msgid'. Reason: In > > the directive number 4, the argument size specifier is invalid. > > > /mnt/b/yoe/master/build/tmp/work/x86_64-linux/fontforge-native/20230101/git/po/fr.po:7435: > > 'msgstr' is not a valid C format string, unlike 'msgid'. Reason: In > > the directive number 2, the argument size specifier is invalid. > > > /mnt/b/yoe/master/build/tmp/work/x86_64-linux/fontforge-native/20230101/git/po/fr.po:19927: > > 'msgstr' is not a valid C format string, unlike 'msgid'. Reason: In > > the directive number 2, the argument size specifier is invalid. > > > /mnt/b/yoe/master/build/tmp/work/x86_64-linux/fontforge-native/20230101/git/po/fr.po:19935: > > 'msgstr' is not a valid C format string, unlike 'msgid'. Reason: In > > the directive number 2, the argument size specifier is invalid. > > > /mnt/b/yoe/master/build/tmp/work/x86_64-linux/fontforge-native/20230101/git/po/fr.po:19970: > > 'msgstr' is not a valid C format string, unlike 'msgid'. Reason: In > > the directive number 2, the argument size specifier is invalid. > > > /mnt/b/yoe/master/build/tmp/work/x86_64-linux/fontforge-native/20230101/git/po/fr.po:19986: > > 'msgstr' is not a valid C format string, unlike 'msgid'. Reason: In > > the directive number 2, the argument size specifier is invalid. > > > /mnt/b/yoe/master/build/tmp/work/x86_64-linux/fontforge-native/20230101/git/po/fr.po:20459: > > 'msgstr' is not a valid C format string, unlike 'msgid'. Reason: In > > the directive number 2, the argument size specifier is invalid. > > > /mnt/b/yoe/master/build/tmp/work/x86_64-linux/fontforge-native/20230101/git/po/fr.po:21045: > > 'msgstr' is not a valid C format string, unlike 'msgid'. Reason: In > > the directive number 2, the argument size specifier is invalid. > > > /mnt/b/yoe/master/build/tmp/work/x86_64-linux/fontforge-native/20230101/git/po/fr.po:21443: > > 'msgstr' is not a valid C format string, unlike 'msgid'. Reason: In > > the directive number 2, the argument size specifier is invalid. > > > /mnt/b/yoe/master/build/tmp/work/x86_64-linux/fontforge-native/20230101/git/po/fr.po:21772: > > 'msgstr' is not a valid C format string, unlike 'msgid'. Reason: In > > the directive number 2, the argument size specifier is invalid. > > > /mnt/b/yoe/master/build/tmp/work/x86_64-linux/fontforge-native/20230101/git/po/fr.po:24553: > > 'msgstr' is not a valid C format string, unlike 'msgid'. Reason: In > > the directive number 2, the argument size specifier is invalid. > > > /mnt/b/yoe/master/build/tmp/work/x86_64-linux/fontforge-native/20230101/git/po/fr.po:24564: > > 'msgstr' is not a valid C format string, unlike 'msgid'. Reason: In > > the directive number 2, the argument size specifier is invalid. > > > /mnt/b/yoe/master/build/tmp/work/x86_64-linux/fontforge-native/20230101/recipe-sysroot-native/usr/bin/msgfmt: > > found 13 fatal errors > > > > On Wed, Sep 6, 2023 at 9:56 AM Alexander Kanavin <alex.kanavin@gmail.com> > wrote: > > > > > > Drop autoconf-2.73.patch as upstream did update the gnulib. > > > > > > Signed-off-by: Alexander Kanavin <alex@linutronix.de> > > > --- > > > .../gettext-0.21.1/autoconf-2.73.patch | 50 ------------------- > > > ...21.1.bb => gettext-minimal-native_0.22.bb} | 0 > > > .../COPYING | 0 > > > meta/recipes-core/gettext/gettext-sources.inc | 2 +- > > > ...t-env.in-do-not-add-C-CXX-parameters.patch | 0 > > > ...01-tests-autopoint-3-unset-MAKEFLAGS.patch | 0 > > > .../parallel.patch | 0 > > > .../{gettext-0.21.1 => gettext}/run-ptest | 0 > > > .../serial-tests-config.patch | 0 > > > .../use-pkgconfig.patch | 0 > > > .../{gettext_0.21.1.bb => gettext_0.22.bb} | 3 +- > > > 11 files changed, 3 insertions(+), 52 deletions(-) > > > delete mode 100644 > meta/recipes-core/gettext/gettext-0.21.1/autoconf-2.73.patch > > > rename meta/recipes-core/gettext/{gettext-minimal-native_0.21.1.bb > => gettext-minimal-native_0.22.bb} (100%) > > > rename meta/recipes-core/gettext/{gettext-minimal-0.21.1 => > gettext-minimal}/COPYING (100%) > > > rename meta/recipes-core/gettext/{gettext-0.21.1 => > gettext}/0001-init-env.in-do-not-add-C-CXX-parameters.patch (100%) > > > rename meta/recipes-core/gettext/{gettext-0.21.1 => > gettext}/0001-tests-autopoint-3-unset-MAKEFLAGS.patch (100%) > > > rename meta/recipes-core/gettext/{gettext-0.21.1 => > gettext}/parallel.patch (100%) > > > rename meta/recipes-core/gettext/{gettext-0.21.1 => > gettext}/run-ptest (100%) > > > rename meta/recipes-core/gettext/{gettext-0.21.1 => > gettext}/serial-tests-config.patch (100%) > > > rename meta/recipes-core/gettext/{gettext-0.21.1 => > gettext}/use-pkgconfig.patch (100%) > > > rename meta/recipes-core/gettext/{gettext_0.21.1.bb => > gettext_0.22.bb} (99%) > > > > > > diff --git > a/meta/recipes-core/gettext/gettext-0.21.1/autoconf-2.73.patch > b/meta/recipes-core/gettext/gettext-0.21.1/autoconf-2.73.patch > > > deleted file mode 100644 > > > index ae5b2491bb8..00000000000 > > > --- a/meta/recipes-core/gettext/gettext-0.21.1/autoconf-2.73.patch > > > +++ /dev/null > > > @@ -1,50 +0,0 @@ > > > -The gnulib largefile macro needs updating to work with autoconf 2.73. > Rather > > > -than the full code: > > > - > > > - > https://git.savannah.gnu.org/cgit/gnulib.git/commit/m4/largefile.m4?id=f91f633858cf132e50924224c50d6264a92caabb > > > - > > > -Just tweak the exiting code to work with 2.73. The next gettext > upgrade should > > > -update to new gnulib > > > - > > > -Upstream-Status: Inappropriate > > > -Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> > > > - > > > -Index: gettext-0.21.1/gettext-runtime/gnulib-m4/largefile.m4 > > > -=================================================================== > > > ---- gettext-0.21.1.orig/gettext-runtime/gnulib-m4/largefile.m4 > > > -+++ gettext-0.21.1/gettext-runtime/gnulib-m4/largefile.m4 > > > -@@ -26,7 +26,7 @@ AC_DEFUN([gl_SET_LARGEFILE_SOURCE], > > > - # with _TIME_BITS. Also, work around a problem in autoconf <= 2.69: > > > - # AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X > 10.5, > > > - # or configures them incorrectly in some cases. > > > --m4_version_prereq([2.70], [], [ > > > -+m4_version_prereq([2.73], [], [ > > > - > > > - # _AC_SYS_LARGEFILE_TEST_INCLUDES > > > - # ------------------------------- > > > -Index: gettext-0.21.1/gettext-tools/gnulib-m4/largefile.m4 > > > -=================================================================== > > > ---- gettext-0.21.1.orig/gettext-tools/gnulib-m4/largefile.m4 > > > -+++ gettext-0.21.1/gettext-tools/gnulib-m4/largefile.m4 > > > -@@ -26,7 +26,7 @@ AC_DEFUN([gl_SET_LARGEFILE_SOURCE], > > > - # with _TIME_BITS. Also, work around a problem in autoconf <= 2.69: > > > - # AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X > 10.5, > > > - # or configures them incorrectly in some cases. > > > --m4_version_prereq([2.70], [], [ > > > -+m4_version_prereq([2.73], [], [ > > > - > > > - # _AC_SYS_LARGEFILE_TEST_INCLUDES > > > - # ------------------------------- > > > -Index: gettext-0.21.1/libtextstyle/gnulib-m4/largefile.m4 > > > -=================================================================== > > > ---- gettext-0.21.1.orig/libtextstyle/gnulib-m4/largefile.m4 > > > -+++ gettext-0.21.1/libtextstyle/gnulib-m4/largefile.m4 > > > -@@ -26,7 +26,7 @@ AC_DEFUN([gl_SET_LARGEFILE_SOURCE], > > > - # with _TIME_BITS. Also, work around a problem in autoconf <= 2.69: > > > - # AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X > 10.5, > > > - # or configures them incorrectly in some cases. > > > --m4_version_prereq([2.70], [], [ > > > -+m4_version_prereq([2.73], [], [ > > > - > > > - # _AC_SYS_LARGEFILE_TEST_INCLUDES > > > - # ------------------------------- > > > diff --git a/meta/recipes-core/gettext/ > gettext-minimal-native_0.21.1.bb b/meta/recipes-core/gettext/ > gettext-minimal-native_0.22.bb > > > similarity index 100% > > > rename from meta/recipes-core/gettext/gettext-minimal-native_0.21.1.bb > > > rename to meta/recipes-core/gettext/gettext-minimal-native_0.22.bb > > > diff --git a/meta/recipes-core/gettext/gettext-minimal-0.21.1/COPYING > b/meta/recipes-core/gettext/gettext-minimal/COPYING > > > similarity index 100% > > > rename from meta/recipes-core/gettext/gettext-minimal-0.21.1/COPYING > > > rename to meta/recipes-core/gettext/gettext-minimal/COPYING > > > diff --git a/meta/recipes-core/gettext/gettext-sources.inc > b/meta/recipes-core/gettext/gettext-sources.inc > > > index da2860fbc85..b4fb6479161 100644 > > > --- a/meta/recipes-core/gettext/gettext-sources.inc > > > +++ b/meta/recipes-core/gettext/gettext-sources.inc > > > @@ -1,4 +1,4 @@ > > > HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html" > > > SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ > > > " > > > -SRC_URI[sha256sum] = > "e8c3650e1d8cee875c4f355642382c1df83058bd5a11ee8555c0cf276d646d45" > > > +SRC_URI[sha256sum] = > "49f089be11b490170bbf09ed2f51e5f5177f55be4cc66504a5861820e0fb06ab" > > > diff --git > a/meta/recipes-core/gettext/gettext-0.21.1/0001-init-env.in-do-not-add-C-CXX-parameters.patch > b/meta/recipes-core/gettext/gettext/0001-init-env.in-do-not-add-C-CXX-parameters.patch > > > similarity index 100% > > > rename from > meta/recipes-core/gettext/gettext-0.21.1/0001-init-env.in-do-not-add-C-CXX-parameters.patch > > > rename to > meta/recipes-core/gettext/gettext/0001-init-env.in-do-not-add-C-CXX-parameters.patch > > > diff --git > a/meta/recipes-core/gettext/gettext-0.21.1/0001-tests-autopoint-3-unset-MAKEFLAGS.patch > b/meta/recipes-core/gettext/gettext/0001-tests-autopoint-3-unset-MAKEFLAGS.patch > > > similarity index 100% > > > rename from > meta/recipes-core/gettext/gettext-0.21.1/0001-tests-autopoint-3-unset-MAKEFLAGS.patch > > > rename to > meta/recipes-core/gettext/gettext/0001-tests-autopoint-3-unset-MAKEFLAGS.patch > > > diff --git a/meta/recipes-core/gettext/gettext-0.21.1/parallel.patch > b/meta/recipes-core/gettext/gettext/parallel.patch > > > similarity index 100% > > > rename from meta/recipes-core/gettext/gettext-0.21.1/parallel.patch > > > rename to meta/recipes-core/gettext/gettext/parallel.patch > > > diff --git a/meta/recipes-core/gettext/gettext-0.21.1/run-ptest > b/meta/recipes-core/gettext/gettext/run-ptest > > > similarity index 100% > > > rename from meta/recipes-core/gettext/gettext-0.21.1/run-ptest > > > rename to meta/recipes-core/gettext/gettext/run-ptest > > > diff --git > a/meta/recipes-core/gettext/gettext-0.21.1/serial-tests-config.patch > b/meta/recipes-core/gettext/gettext/serial-tests-config.patch > > > similarity index 100% > > > rename from > meta/recipes-core/gettext/gettext-0.21.1/serial-tests-config.patch > > > rename to meta/recipes-core/gettext/gettext/serial-tests-config.patch > > > diff --git > a/meta/recipes-core/gettext/gettext-0.21.1/use-pkgconfig.patch > b/meta/recipes-core/gettext/gettext/use-pkgconfig.patch > > > similarity index 100% > > > rename from > meta/recipes-core/gettext/gettext-0.21.1/use-pkgconfig.patch > > > rename to meta/recipes-core/gettext/gettext/use-pkgconfig.patch > > > diff --git a/meta/recipes-core/gettext/gettext_0.21.1.bb > b/meta/recipes-core/gettext/gettext_0.22.bb > > > similarity index 99% > > > rename from meta/recipes-core/gettext/gettext_0.21.1.bb > > > rename to meta/recipes-core/gettext/gettext_0.22.bb > > > index a3eb3bba541..71e84521b0d 100644 > > > --- a/meta/recipes-core/gettext/gettext_0.21.1.bb > > > +++ b/meta/recipes-core/gettext/gettext_0.22.bb > > > @@ -30,7 +30,6 @@ SRC_URI += " \ > > > file://serial-tests-config.patch \ > > > file://0001-tests-autopoint-3-unset-MAKEFLAGS.patch \ > > > file://0001-init-env.in-do-not-add-C-CXX-parameters.patch \ > > > - file://autoconf-2.73.patch \ > > > " > > > > > > inherit autotools texinfo pkgconfig ptest > > > @@ -201,6 +200,8 @@ RDEPENDS:${PN}-ptest:append:libc-glibc = "\ > > > glibc-charmap-euc-kr \ > > > glibc-gconv-euc-jp \ > > > glibc-charmap-euc-jp \ > > > + glibc-gconv-gb18030 \ > > > + glibc-charmap-gb18030 \ > > > locale-base-de-de \ > > > locale-base-fr-fr \ > > > " > > > -- > > > 2.30.2 > > > > > > > > > -=-=-=-=-=-=-=-=-=-=-=- > > > Links: You receive all messages sent to this group. > > > View/Reply Online (#187324): > https://lists.openembedded.org/g/openembedded-core/message/187324 > > > Mute This Topic: https://lists.openembedded.org/mt/101197336/1997914 > > > Group Owner: openembedded-core+owner@lists.openembedded.org > > > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub > [raj.khem@gmail.com] > > > -=-=-=-=-=-=-=-=-=-=-=- > > > >
diff --git a/meta/recipes-core/gettext/gettext-0.21.1/autoconf-2.73.patch b/meta/recipes-core/gettext/gettext-0.21.1/autoconf-2.73.patch deleted file mode 100644 index ae5b2491bb8..00000000000 --- a/meta/recipes-core/gettext/gettext-0.21.1/autoconf-2.73.patch +++ /dev/null @@ -1,50 +0,0 @@ -The gnulib largefile macro needs updating to work with autoconf 2.73. Rather -than the full code: - -https://git.savannah.gnu.org/cgit/gnulib.git/commit/m4/largefile.m4?id=f91f633858cf132e50924224c50d6264a92caabb - -Just tweak the exiting code to work with 2.73. The next gettext upgrade should -update to new gnulib - -Upstream-Status: Inappropriate -Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> - -Index: gettext-0.21.1/gettext-runtime/gnulib-m4/largefile.m4 -=================================================================== ---- gettext-0.21.1.orig/gettext-runtime/gnulib-m4/largefile.m4 -+++ gettext-0.21.1/gettext-runtime/gnulib-m4/largefile.m4 -@@ -26,7 +26,7 @@ AC_DEFUN([gl_SET_LARGEFILE_SOURCE], - # with _TIME_BITS. Also, work around a problem in autoconf <= 2.69: - # AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5, - # or configures them incorrectly in some cases. --m4_version_prereq([2.70], [], [ -+m4_version_prereq([2.73], [], [ - - # _AC_SYS_LARGEFILE_TEST_INCLUDES - # ------------------------------- -Index: gettext-0.21.1/gettext-tools/gnulib-m4/largefile.m4 -=================================================================== ---- gettext-0.21.1.orig/gettext-tools/gnulib-m4/largefile.m4 -+++ gettext-0.21.1/gettext-tools/gnulib-m4/largefile.m4 -@@ -26,7 +26,7 @@ AC_DEFUN([gl_SET_LARGEFILE_SOURCE], - # with _TIME_BITS. Also, work around a problem in autoconf <= 2.69: - # AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5, - # or configures them incorrectly in some cases. --m4_version_prereq([2.70], [], [ -+m4_version_prereq([2.73], [], [ - - # _AC_SYS_LARGEFILE_TEST_INCLUDES - # ------------------------------- -Index: gettext-0.21.1/libtextstyle/gnulib-m4/largefile.m4 -=================================================================== ---- gettext-0.21.1.orig/libtextstyle/gnulib-m4/largefile.m4 -+++ gettext-0.21.1/libtextstyle/gnulib-m4/largefile.m4 -@@ -26,7 +26,7 @@ AC_DEFUN([gl_SET_LARGEFILE_SOURCE], - # with _TIME_BITS. Also, work around a problem in autoconf <= 2.69: - # AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5, - # or configures them incorrectly in some cases. --m4_version_prereq([2.70], [], [ -+m4_version_prereq([2.73], [], [ - - # _AC_SYS_LARGEFILE_TEST_INCLUDES - # ------------------------------- diff --git a/meta/recipes-core/gettext/gettext-minimal-native_0.21.1.bb b/meta/recipes-core/gettext/gettext-minimal-native_0.22.bb similarity index 100% rename from meta/recipes-core/gettext/gettext-minimal-native_0.21.1.bb rename to meta/recipes-core/gettext/gettext-minimal-native_0.22.bb diff --git a/meta/recipes-core/gettext/gettext-minimal-0.21.1/COPYING b/meta/recipes-core/gettext/gettext-minimal/COPYING similarity index 100% rename from meta/recipes-core/gettext/gettext-minimal-0.21.1/COPYING rename to meta/recipes-core/gettext/gettext-minimal/COPYING diff --git a/meta/recipes-core/gettext/gettext-sources.inc b/meta/recipes-core/gettext/gettext-sources.inc index da2860fbc85..b4fb6479161 100644 --- a/meta/recipes-core/gettext/gettext-sources.inc +++ b/meta/recipes-core/gettext/gettext-sources.inc @@ -1,4 +1,4 @@ HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html" SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ " -SRC_URI[sha256sum] = "e8c3650e1d8cee875c4f355642382c1df83058bd5a11ee8555c0cf276d646d45" +SRC_URI[sha256sum] = "49f089be11b490170bbf09ed2f51e5f5177f55be4cc66504a5861820e0fb06ab" diff --git a/meta/recipes-core/gettext/gettext-0.21.1/0001-init-env.in-do-not-add-C-CXX-parameters.patch b/meta/recipes-core/gettext/gettext/0001-init-env.in-do-not-add-C-CXX-parameters.patch similarity index 100% rename from meta/recipes-core/gettext/gettext-0.21.1/0001-init-env.in-do-not-add-C-CXX-parameters.patch rename to meta/recipes-core/gettext/gettext/0001-init-env.in-do-not-add-C-CXX-parameters.patch diff --git a/meta/recipes-core/gettext/gettext-0.21.1/0001-tests-autopoint-3-unset-MAKEFLAGS.patch b/meta/recipes-core/gettext/gettext/0001-tests-autopoint-3-unset-MAKEFLAGS.patch similarity index 100% rename from meta/recipes-core/gettext/gettext-0.21.1/0001-tests-autopoint-3-unset-MAKEFLAGS.patch rename to meta/recipes-core/gettext/gettext/0001-tests-autopoint-3-unset-MAKEFLAGS.patch diff --git a/meta/recipes-core/gettext/gettext-0.21.1/parallel.patch b/meta/recipes-core/gettext/gettext/parallel.patch similarity index 100% rename from meta/recipes-core/gettext/gettext-0.21.1/parallel.patch rename to meta/recipes-core/gettext/gettext/parallel.patch diff --git a/meta/recipes-core/gettext/gettext-0.21.1/run-ptest b/meta/recipes-core/gettext/gettext/run-ptest similarity index 100% rename from meta/recipes-core/gettext/gettext-0.21.1/run-ptest rename to meta/recipes-core/gettext/gettext/run-ptest diff --git a/meta/recipes-core/gettext/gettext-0.21.1/serial-tests-config.patch b/meta/recipes-core/gettext/gettext/serial-tests-config.patch similarity index 100% rename from meta/recipes-core/gettext/gettext-0.21.1/serial-tests-config.patch rename to meta/recipes-core/gettext/gettext/serial-tests-config.patch diff --git a/meta/recipes-core/gettext/gettext-0.21.1/use-pkgconfig.patch b/meta/recipes-core/gettext/gettext/use-pkgconfig.patch similarity index 100% rename from meta/recipes-core/gettext/gettext-0.21.1/use-pkgconfig.patch rename to meta/recipes-core/gettext/gettext/use-pkgconfig.patch diff --git a/meta/recipes-core/gettext/gettext_0.21.1.bb b/meta/recipes-core/gettext/gettext_0.22.bb similarity index 99% rename from meta/recipes-core/gettext/gettext_0.21.1.bb rename to meta/recipes-core/gettext/gettext_0.22.bb index a3eb3bba541..71e84521b0d 100644 --- a/meta/recipes-core/gettext/gettext_0.21.1.bb +++ b/meta/recipes-core/gettext/gettext_0.22.bb @@ -30,7 +30,6 @@ SRC_URI += " \ file://serial-tests-config.patch \ file://0001-tests-autopoint-3-unset-MAKEFLAGS.patch \ file://0001-init-env.in-do-not-add-C-CXX-parameters.patch \ - file://autoconf-2.73.patch \ " inherit autotools texinfo pkgconfig ptest @@ -201,6 +200,8 @@ RDEPENDS:${PN}-ptest:append:libc-glibc = "\ glibc-charmap-euc-kr \ glibc-gconv-euc-jp \ glibc-charmap-euc-jp \ + glibc-gconv-gb18030 \ + glibc-charmap-gb18030 \ locale-base-de-de \ locale-base-fr-fr \ "
Drop autoconf-2.73.patch as upstream did update the gnulib. Signed-off-by: Alexander Kanavin <alex@linutronix.de> --- .../gettext-0.21.1/autoconf-2.73.patch | 50 ------------------- ...21.1.bb => gettext-minimal-native_0.22.bb} | 0 .../COPYING | 0 meta/recipes-core/gettext/gettext-sources.inc | 2 +- ...t-env.in-do-not-add-C-CXX-parameters.patch | 0 ...01-tests-autopoint-3-unset-MAKEFLAGS.patch | 0 .../parallel.patch | 0 .../{gettext-0.21.1 => gettext}/run-ptest | 0 .../serial-tests-config.patch | 0 .../use-pkgconfig.patch | 0 .../{gettext_0.21.1.bb => gettext_0.22.bb} | 3 +- 11 files changed, 3 insertions(+), 52 deletions(-) delete mode 100644 meta/recipes-core/gettext/gettext-0.21.1/autoconf-2.73.patch rename meta/recipes-core/gettext/{gettext-minimal-native_0.21.1.bb => gettext-minimal-native_0.22.bb} (100%) rename meta/recipes-core/gettext/{gettext-minimal-0.21.1 => gettext-minimal}/COPYING (100%) rename meta/recipes-core/gettext/{gettext-0.21.1 => gettext}/0001-init-env.in-do-not-add-C-CXX-parameters.patch (100%) rename meta/recipes-core/gettext/{gettext-0.21.1 => gettext}/0001-tests-autopoint-3-unset-MAKEFLAGS.patch (100%) rename meta/recipes-core/gettext/{gettext-0.21.1 => gettext}/parallel.patch (100%) rename meta/recipes-core/gettext/{gettext-0.21.1 => gettext}/run-ptest (100%) rename meta/recipes-core/gettext/{gettext-0.21.1 => gettext}/serial-tests-config.patch (100%) rename meta/recipes-core/gettext/{gettext-0.21.1 => gettext}/use-pkgconfig.patch (100%) rename meta/recipes-core/gettext/{gettext_0.21.1.bb => gettext_0.22.bb} (99%)