diff options
| author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2016-05-17 15:18:55 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-17 17:26:05 +0100 |
| commit | 84b11bce72296d04a0e6bc9f18669284017c3704 (patch) | |
| tree | 6f5e5a1b006e3917e0c0354abc39a10fcdce8efa | |
| parent | ce508c68bbea40d7f51c1975566ca70fcaa743a3 (diff) | |
| download | openembedded-core-84b11bce72296d04a0e6bc9f18669284017c3704.tar.gz openembedded-core-84b11bce72296d04a0e6bc9f18669284017c3704.tar.bz2 openembedded-core-84b11bce72296d04a0e6bc9f18669284017c3704.zip | |
pkgconfig: Update AM_GLIB_GNU_GETTEXT macro
This fixes
error: m4_copy: won't overwrite defined macro: glib_DEFUN
with glib-2.0 >= 2.48.
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-devtools/pkgconfig/pkgconfig/0001-glib-gettext.m4-Update-AM_GLIB_GNU_GETTEXT-to-match-.patch | 41 | ||||
| -rw-r--r-- | meta/recipes-devtools/pkgconfig/pkgconfig_git.bb | 1 |
2 files changed, 42 insertions, 0 deletions
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig/0001-glib-gettext.m4-Update-AM_GLIB_GNU_GETTEXT-to-match-.patch b/meta/recipes-devtools/pkgconfig/pkgconfig/0001-glib-gettext.m4-Update-AM_GLIB_GNU_GETTEXT-to-match-.patch new file mode 100644 index 0000000000..80310cd370 --- /dev/null +++ b/meta/recipes-devtools/pkgconfig/pkgconfig/0001-glib-gettext.m4-Update-AM_GLIB_GNU_GETTEXT-to-match-.patch @@ -0,0 +1,41 @@ +From e404e27de77d8b993c4cc87013d707200b3a5547 Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen <jussi.kukkonen@intel.com> +Date: Tue, 17 May 2016 13:26:27 +0300 +Subject: [PATCH] glib-gettext.m4: Update AM_GLIB_GNU_GETTEXT to match glib + +This avoids + error: m4_copy: won't overwrite defined macro: glib_DEFUN + +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> +Upstream-Status: Pending + +--- + glib/m4macros/glib-gettext.m4 | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/glib/m4macros/glib-gettext.m4 b/glib/m4macros/glib-gettext.m4 +index 5217fd8..155b1d8 100644 +--- a/glib/m4macros/glib-gettext.m4 ++++ b/glib/m4macros/glib-gettext.m4 +@@ -313,7 +313,7 @@ msgstr "" + # on various variables needed by the Makefile.in.in installed by + # glib-gettextize. + dnl +-glib_DEFUN([GLIB_GNU_GETTEXT], ++AU_DEFUN([GLIB_GNU_GETTEXT], + [AC_REQUIRE([AC_PROG_CC])dnl + + GLIB_LC_MESSAGES +@@ -383,7 +383,8 @@ glib_DEFUN([GLIB_GNU_GETTEXT], + rm -f po/POTFILES + sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ + < $srcdir/po/POTFILES.in > po/POTFILES +- ]) ++ ], ++ [[$0: This macro is deprecated. You should use upstream gettext instead.]]) + + # AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) + # ------------------------------- +-- +2.1.4 + diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb b/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb index 86503b5fec..ff8254cfcd 100644 --- a/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb +++ b/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb @@ -19,6 +19,7 @@ SRC_URI = "git://anongit.freedesktop.org/pkg-config \ file://pkg-config-native.in \ file://fix-glib-configure-libtool-usage.patch \ file://0001-gdate-Move-warning-pragma-outside-of-function.patch \ + file://0001-glib-gettext.m4-Update-AM_GLIB_GNU_GETTEXT-to-match-.patch \ " S = "${WORKDIR}/git" |