diff options
Diffstat (limited to 'meta/recipes-devtools/pkgconfig')
-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 @@ | |||
1 | From e404e27de77d8b993c4cc87013d707200b3a5547 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
3 | Date: Tue, 17 May 2016 13:26:27 +0300 | ||
4 | Subject: [PATCH] glib-gettext.m4: Update AM_GLIB_GNU_GETTEXT to match glib | ||
5 | |||
6 | This avoids | ||
7 | error: m4_copy: won't overwrite defined macro: glib_DEFUN | ||
8 | |||
9 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
10 | Upstream-Status: Pending | ||
11 | |||
12 | --- | ||
13 | glib/m4macros/glib-gettext.m4 | 5 +++-- | ||
14 | 1 file changed, 3 insertions(+), 2 deletions(-) | ||
15 | |||
16 | diff --git a/glib/m4macros/glib-gettext.m4 b/glib/m4macros/glib-gettext.m4 | ||
17 | index 5217fd8..155b1d8 100644 | ||
18 | --- a/glib/m4macros/glib-gettext.m4 | ||
19 | +++ b/glib/m4macros/glib-gettext.m4 | ||
20 | @@ -313,7 +313,7 @@ msgstr "" | ||
21 | # on various variables needed by the Makefile.in.in installed by | ||
22 | # glib-gettextize. | ||
23 | dnl | ||
24 | -glib_DEFUN([GLIB_GNU_GETTEXT], | ||
25 | +AU_DEFUN([GLIB_GNU_GETTEXT], | ||
26 | [AC_REQUIRE([AC_PROG_CC])dnl | ||
27 | |||
28 | GLIB_LC_MESSAGES | ||
29 | @@ -383,7 +383,8 @@ glib_DEFUN([GLIB_GNU_GETTEXT], | ||
30 | rm -f po/POTFILES | ||
31 | sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ | ||
32 | < $srcdir/po/POTFILES.in > po/POTFILES | ||
33 | - ]) | ||
34 | + ], | ||
35 | + [[$0: This macro is deprecated. You should use upstream gettext instead.]]) | ||
36 | |||
37 | # AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) | ||
38 | # ------------------------------- | ||
39 | -- | ||
40 | 2.1.4 | ||
41 | |||
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 \ | |||
19 | file://pkg-config-native.in \ | 19 | file://pkg-config-native.in \ |
20 | file://fix-glib-configure-libtool-usage.patch \ | 20 | file://fix-glib-configure-libtool-usage.patch \ |
21 | file://0001-gdate-Move-warning-pragma-outside-of-function.patch \ | 21 | file://0001-gdate-Move-warning-pragma-outside-of-function.patch \ |
22 | file://0001-glib-gettext.m4-Update-AM_GLIB_GNU_GETTEXT-to-match-.patch \ | ||
22 | " | 23 | " |
23 | 24 | ||
24 | S = "${WORKDIR}/git" | 25 | S = "${WORKDIR}/git" |