[OE-core] [master][PATCH v2] pkgconfig: Fix build with gcc-6 and upgrade to 0.29.1

[Khem Raj]

Please look into my gcc-6 branch, this is fixed with

http://git.openembedded.org/openembedded-core-contrib/commit/?h=kraj/gcc-6&id=64ff9cec84c28348fda7ec5b8e1d98cfe94c7949

> On May 10, 2016, at 9:22 AM, danismostlikely at gmail.com wrote:
> 
> From: Dan McGregor <danismostlikely at gmail.com>
> 
> From: Daniel McGregor <daniel.mcgregor at vecima.com>
> 
> glib patch is backported from glib-2.0 upstream
> eventually we will throw it away once pkgconfig
> moves to newer glib
> 
> Signed-off-by: Daniel McGregor <daniel.mcgregor at vecima.com>
> Signed-off-by: Khem Raj <raj.khem at gmail.com>
> ---
> ...e-Move-warning-pragma-outside-of-function.patch | 39 ++++++++++++++++++++++
> meta/recipes-devtools/pkgconfig/pkgconfig_git.bb   |  6 ++--
> 2 files changed, 43 insertions(+), 2 deletions(-)
> create mode 100644 meta/recipes-devtools/pkgconfig/pkgconfig/0001-gdate-Move-warning-pragma-outside-of-function.patch
> 
> diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig/0001-gdate-Move-warning-pragma-outside-of-function.patch b/meta/recipes-devtools/pkgconfig/pkgconfig/0001-gdate-Move-warning-pragma-outside-of-function.patch
> new file mode 100644
> index 0000000..14c8293
> --- /dev/null
> +++ b/meta/recipes-devtools/pkgconfig/pkgconfig/0001-gdate-Move-warning-pragma-outside-of-function.patch
> @@ -0,0 +1,39 @@
> +From 946d36266d8a30f04fe34d3183bf4929141934d2 Mon Sep 17 00:00:00 2001
> +From: coypu <coypu at sdf.org>
> +Date: Wed, 2 Mar 2016 19:38:48 +0200
> +Subject: [PATCH] gdate: Move warning pragma outside of function
> +
> +Commit 0817af40e8c74c721c30f6ef482b1f53d12044c7 breaks the build on
> +older versions of GCC, which don't allow pragma inside functions.
> +
> +https://bugzilla.gnome.org/761550
> +---
> +Upstream-Status: Backport
> +Signed-off-by: Khem Raj <raj.khem at gmail.com>
> +
> + glib/glib/gdate.c | 5 +++++
> + 1 file changed, 5 insertions(+)
> +
> +diff --git a/glib/glib/gdate.c b/glib/glib/gdate.c
> +index 1978cf7..20e6c4a 100644
> +--- a/glib/glib/gdate.c
> ++++ b/glib/glib/gdate.c
> +@@ -2439,6 +2439,9 @@ win32_strftime_helper (const GDate     *d,
> +  *
> +  * Returns: number of characters written to the buffer, or 0 the buffer was too small
> +  */
> ++#pragma GCC diagnostic push
> ++#pragma GCC diagnostic ignored "-Wformat-nonliteral"
> ++
> + gsize
> + g_date_strftime (gchar       *s,
> +                  gsize        slen,
> +@@ -2549,3 +2552,5 @@ g_date_strftime (gchar       *s,
> +   return retval;
> + #endif
> + }
> ++
> ++#pragma GCC diagnostic pop
> +--
> +1.9.1
> +
> diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb b/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb
> index d34f608..f654eee 100644
> --- a/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb
> +++ b/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb
> @@ -12,12 +12,13 @@ DEPENDS = "glib-2.0"
> DEPENDS_class-native = ""
> DEPENDS_class-nativesdk = ""
> 
> -SRCREV = "5914edfe9604abfedd220103cbac382fc4d268bb"
> -PV = "0.29+git${SRCPV}"
> +SRCREV = "87152c05be88ca8be71a3a563f275b3686d32c28"
> +PV = "0.29.1+git${SRCPV}"
> 
> 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 \
>            "
> 
> S = "${WORKDIR}/git"
> @@ -27,6 +28,7 @@ inherit autotools
> EXTRA_OECONF = "--without-internal-glib"
> EXTRA_OECONF_class-native = "--with-internal-glib"
> EXTRA_OECONF_class-nativesdk = "--with-internal-glib"
> +CFLAGS_append_class-native = " -Wno-error=format-nonliteral"
> 
> acpaths = "-I ."
> 
> --
> 2.8.2
> 
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 204 bytes
Desc: Message signed with OpenPGP using GPGMail
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20160510/c898eec8/attachment-0002.sig>