* [PATCH 00/14] Fix world build with gcc-5
@ 2015-04-24 3:35 Khem Raj
2015-04-24 3:35 ` [PATCH 01/14] glibc, packagegroup-self-hosted, packagegroup-core-lsb: Consider non-glibc libcs Khem Raj
` (14 more replies)
0 siblings, 15 replies; 27+ messages in thread
From: Khem Raj @ 2015-04-24 3:35 UTC (permalink / raw)
To: openembedded-core
I saw that my prior pull request has not yet been picked so I took opportunity to update it
with few more commits and remove the commits not needed for world builds out.
With these world builds on OE-Core are succeeding for all supported qemu machines
The gcc upgrade is not yet proposed since we are still in RC phase and as soon as
5.1.0 is released I will propose it for OE-Core
Khem Raj (14):
glibc, packagegroup-self-hosted, packagegroup-core-lsb: Consider
non-glibc libcs
insserv: Fix build with gcc5 and clang
xserver-xorg: Fix build with gcc-5
u-boot-mkimage: Backport fix from upstream to fix build with gcc-5
mdadm: Fix inline semantics
lttng-tools: Add extern qualifier to declarations in .h file
subversion: Add -P to CPPFLAGS
gnome-icon-theme: Needs nls.m4
gtk+: Correct function prototype
grub: Backport const qualifier fix for gcc-5
gummiboot: upgrade 43 -> 48+git
pkgconfig: Upgrade to latest git tip
fontconfig: Upgrade to 2.11.93
fontconfig: Fix pkgconfig file generation to not have absolute paths
..._dhcp_vendor-Add-missing-const-qualifiers.patch | 33 ++
meta/recipes-bsp/grub/grub2.inc | 1 +
.../gummiboot/gummiboot/fix-objcopy.patch | 28 +-
meta/recipes-bsp/gummiboot/gummiboot_git.bb | 4 +-
meta/recipes-bsp/u-boot/u-boot-mkimage/gcc5.patch | 91 ++++
meta/recipes-bsp/u-boot/u-boot-mkimage_2015.01.bb | 4 +-
meta/recipes-core/glibc/glibc_2.21.bb | 8 +-
.../packagegroups/packagegroup-self-hosted.bb | 7 +-
.../161_bts777914_fix_undeclared_identifier.patch | 36 ++
meta/recipes-devtools/insserv/insserv_1.14.0.bb | 1 +
...Strip-system-library-directories-reliably.patch | 30 --
.../pkgconfig/pkgconfig-0.28/autofoo.patch | 528 ---------------------
.../pkgconfig-0.28/obsolete_automake_macros.patch | 16 -
meta/recipes-devtools/pkgconfig/pkgconfig.inc | 6 +-
.../pkgconfig/pkgconfig/autofoo.patch | 528 ---------------------
.../fix-glib-configure-libtool-usage.patch | 0
meta/recipes-devtools/pkgconfig/pkgconfig_0.28.bb | 11 -
meta/recipes-devtools/pkgconfig/pkgconfig_git.bb | 42 +-
.../subversion/subversion_1.8.11.bb | 3 +-
meta/recipes-extended/mdadm/files/inline.patch | 39 ++
meta/recipes-extended/mdadm/mdadm_3.3.2.bb | 1 +
.../packagegroups/packagegroup-core-lsb.bb | 9 +
.../recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb | 2 +-
.../gtk+/gtk+/strict-prototypes.patch | 24 +
meta/recipes-gnome/gtk+/gtk+_2.24.27.bb | 1 +
.../fontconfig/revert-static-pkgconfig.patch | 20 +
...{fontconfig_2.11.1.bb => fontconfig_2.11.93.bb} | 7 +-
...sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch | 50 ++
.../xorg-xserver/xserver-xorg_1.16.3.bb | 1 +
.../lttng/lttng-tools/extern-decls.patch | 442 +++++++++++++++++
meta/recipes-kernel/lttng/lttng-tools_2.6.0.bb | 1 +
31 files changed, 794 insertions(+), 1180 deletions(-)
create mode 100644 meta/recipes-bsp/grub/files/0001-parse_dhcp_vendor-Add-missing-const-qualifiers.patch
create mode 100644 meta/recipes-bsp/u-boot/u-boot-mkimage/gcc5.patch
create mode 100644 meta/recipes-devtools/insserv/files/161_bts777914_fix_undeclared_identifier.patch
delete mode 100644 meta/recipes-devtools/pkgconfig/pkgconfig-0.28/0001-Strip-system-library-directories-reliably.patch
delete mode 100644 meta/recipes-devtools/pkgconfig/pkgconfig-0.28/autofoo.patch
delete mode 100644 meta/recipes-devtools/pkgconfig/pkgconfig-0.28/obsolete_automake_macros.patch
delete mode 100644 meta/recipes-devtools/pkgconfig/pkgconfig/autofoo.patch
rename meta/recipes-devtools/pkgconfig/{pkgconfig-0.28 => pkgconfig}/fix-glib-configure-libtool-usage.patch (100%)
delete mode 100644 meta/recipes-devtools/pkgconfig/pkgconfig_0.28.bb
create mode 100644 meta/recipes-extended/mdadm/files/inline.patch
create mode 100644 meta/recipes-gnome/gtk+/gtk+/strict-prototypes.patch
create mode 100644 meta/recipes-graphics/fontconfig/fontconfig/revert-static-pkgconfig.patch
rename meta/recipes-graphics/fontconfig/{fontconfig_2.11.1.bb => fontconfig_2.11.93.bb} (83%)
create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch
create mode 100644 meta/recipes-kernel/lttng/lttng-tools/extern-decls.patch
--
2.1.4
^ permalink raw reply [flat|nested] 27+ messages in thread
* [PATCH 01/14] glibc, packagegroup-self-hosted, packagegroup-core-lsb: Consider non-glibc libcs
2015-04-24 3:35 [PATCH 00/14] Fix world build with gcc-5 Khem Raj
@ 2015-04-24 3:35 ` Khem Raj
2015-04-24 3:35 ` [PATCH 02/14] insserv: Fix build with gcc5 and clang Khem Raj
` (13 subsequent siblings)
14 siblings, 0 replies; 27+ messages in thread
From: Khem Raj @ 2015-04-24 3:35 UTC (permalink / raw)
To: openembedded-core
Make skipping expression simpler to check for given libc
Make sure glibc specific items are covered with right override
Change-Id: I8b4a0b7cbfe38ffdc9320f798038c79c7220552b
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/recipes-core/glibc/glibc_2.21.bb | 8 +++-----
meta/recipes-core/packagegroups/packagegroup-self-hosted.bb | 7 ++++---
meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb | 9 +++++++++
3 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/meta/recipes-core/glibc/glibc_2.21.bb b/meta/recipes-core/glibc/glibc_2.21.bb
index fcef4ff..58a9601 100644
--- a/meta/recipes-core/glibc/glibc_2.21.bb
+++ b/meta/recipes-core/glibc/glibc_2.21.bb
@@ -68,11 +68,9 @@ GLIBC_BROKEN_LOCALES = " _ER _ET so_ET yn_ER sid_ET tr_TR mn_MN gez_ET gez_ER bn
# this helps in easing out parsing for non-glibc system libraries
#
python __anonymous () {
- import re
- notglibc = (re.match('.*uclibc$', d.getVar('TARGET_OS', True)) != None) or (re.match('.*musl$', d.getVar('TARGET_OS', True)) != None)
- if notglibc:
- raise bb.parse.SkipPackage("incompatible with target %s" %
- d.getVar('TARGET_OS', True))
+ if d.getVar('TCLIBC', True) != "glibc":
+ raise bb.parse.SkipPackage("incompatible with %s C library" %
+ d.getVar('TCLIBC', True))
}
EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \
diff --git a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
index 47589b6..531f729 100644
--- a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
@@ -62,7 +62,6 @@ RRECOMMENDS_packagegroup-self-hosted-host-tools = "\
kernel-module-iptable-filter \
"
-# glibc-utils: for rpcgen
RDEPENDS_packagegroup-self-hosted-sdk = "\
autoconf \
automake \
@@ -73,7 +72,6 @@ RDEPENDS_packagegroup-self-hosted-sdk = "\
cpp \
cpp-symlinks \
distcc \
- glibc-utils \
glibc-gconv-ibm850 \
file \
findutils \
@@ -98,7 +96,10 @@ RDEPENDS_packagegroup-self-hosted-sdk = "\
quilt \
sed \
"
-
+# glibc-utils: for rpcgen
+RDEPENDS_packagegroup-self-hosted-sdk_append_libc-glibc = "\
+ glibc-utils \
+ "
RDEPENDS_packagegroup-self-hosted-debug = " \
gdb \
gdbserver \
diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
index e0f32e0..a07a6ad 100644
--- a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
+++ b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
@@ -9,6 +9,15 @@ LICENSE = "MIT"
inherit packagegroup
+#
+# We will skip parsing this packagegeoup for non-glibc systems
+#
+python __anonymous () {
+ if d.getVar('TCLIBC', True) != "glibc":
+ raise bb.parse.SkipPackage("incompatible with %s C library" %
+ d.getVar('TCLIBC', True))
+}
+
PACKAGES = "\
packagegroup-core-lsb \
packagegroup-core-sys-extended \
--
2.1.4
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH 02/14] insserv: Fix build with gcc5 and clang
2015-04-24 3:35 [PATCH 00/14] Fix world build with gcc-5 Khem Raj
2015-04-24 3:35 ` [PATCH 01/14] glibc, packagegroup-self-hosted, packagegroup-core-lsb: Consider non-glibc libcs Khem Raj
@ 2015-04-24 3:35 ` Khem Raj
2015-04-24 10:17 ` Richard Purdie
2015-04-24 3:35 ` [PATCH 03/14] xserver-xorg: Fix build with gcc-5 Khem Raj
` (12 subsequent siblings)
14 siblings, 1 reply; 27+ messages in thread
From: Khem Raj @ 2015-04-24 3:35 UTC (permalink / raw)
To: openembedded-core
Kill 2 bugs with one patch
| insserv.c:997:5: note: each undeclared identifier is reported only
once for each function it appears in
| insserv.c:997:15: error: expected ';' before 'char'
| extension char buf[strlen(myname)+2+strlen(fmt)+1];
| ^
| insserv.c: In function 'main':
| insserv.c:2379:5: error: 'extension' undeclared (first use in this
function)
| extension char * argr[argc];
| ^
| insserv.c:2379:15: error: expected ';' before 'char'
| extension char * argr[argc];
| ^
| insserv.c:2401:2: error: 'argr' undeclared (first use in this
function)
| argr[c] = (char*)0;
| ^
Change-Id: I36b7fb9e8baeda5a7cc252da10c0527401248226
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../161_bts777914_fix_undeclared_identifier.patch | 36 ++++++++++++++++++++++
meta/recipes-devtools/insserv/insserv_1.14.0.bb | 1 +
2 files changed, 37 insertions(+)
create mode 100644 meta/recipes-devtools/insserv/files/161_bts777914_fix_undeclared_identifier.patch
diff --git a/meta/recipes-devtools/insserv/files/161_bts777914_fix_undeclared_identifier.patch b/meta/recipes-devtools/insserv/files/161_bts777914_fix_undeclared_identifier.patch
new file mode 100644
index 0000000..6ee9532
--- /dev/null
+++ b/meta/recipes-devtools/insserv/files/161_bts777914_fix_undeclared_identifier.patch
@@ -0,0 +1,36 @@
+Upstream-Status: Pending
+
+insserv (1.14.0-5.1) UNRELEASED; urgency=low
+
+ * Non-maintainer upload.
+ * moving definition of "extension" in listing.h outside of
+ an if loop with condition related to __STDC_VERSION__.
+ * I observed that this gets build with gcc-4.9.2, as for gcc
+ __STDC_VERSION__ is not defined.
+ * I got these error while using clang to build this package.
+ * I tested it with clang-3.5(__STDC_VERSION__ 199901L) and
+ clang 3.7(__STDC_VERSION__ 201112L) and getting same error
+ described in in Bug #777914.
+
+ -- Mohit Bhakkad <mohit.bhakkad@gmail.com> Sat, 04 Apr 2015 19:14:48 +0000
+
+ insserv (1.14.0-5) unstable; urgency=low
+
+ * Add +mountall-bootclean to $local_fs virtual facility definition in
+Index: insserv-1.14.0/listing.h
+===================================================================
+--- insserv-1.14.0.orig/listing.h
++++ insserv-1.14.0/listing.h
+@@ -47,9 +47,9 @@ typedef unsigned int uint;
+ # ifndef asm
+ # define asm __asm__
+ # endif
+-# ifndef extension
+-# define extension __extension__
+-# endif
++#endif
++#ifndef extension
++# define extension __extension__
+ #endif
+ #ifndef attribute
+ # define attribute(attr) __attribute__(attr)
diff --git a/meta/recipes-devtools/insserv/insserv_1.14.0.bb b/meta/recipes-devtools/insserv/insserv_1.14.0.bb
index 4a33e16..b66e98b 100644
--- a/meta/recipes-devtools/insserv/insserv_1.14.0.bb
+++ b/meta/recipes-devtools/insserv/insserv_1.14.0.bb
@@ -11,6 +11,7 @@ PR = "r1"
SRC_URI = "ftp://ftp.suse.com/pub/projects/init/${BPN}-${PV}.tar.bz2 \
file://makefile.patch \
file://disable_runtests.patch \
+ file://161_bts777914_fix_undeclared_identifier.patch \
file://insserv.conf \
file://run-ptest \
"
--
2.1.4
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH 03/14] xserver-xorg: Fix build with gcc-5
2015-04-24 3:35 [PATCH 00/14] Fix world build with gcc-5 Khem Raj
2015-04-24 3:35 ` [PATCH 01/14] glibc, packagegroup-self-hosted, packagegroup-core-lsb: Consider non-glibc libcs Khem Raj
2015-04-24 3:35 ` [PATCH 02/14] insserv: Fix build with gcc5 and clang Khem Raj
@ 2015-04-24 3:35 ` Khem Raj
2015-04-27 14:58 ` Burton, Ross
2015-04-24 3:35 ` [PATCH 04/14] u-boot-mkimage: Backport fix from upstream to fix " Khem Raj
` (11 subsequent siblings)
14 siblings, 1 reply; 27+ messages in thread
From: Khem Raj @ 2015-04-24 3:35 UTC (permalink / raw)
To: openembedded-core
Backport a patch from fedora details are in patch header
Change-Id: I6b8dfaae3b751071bf8b0d88b15a4f95c19877f6
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
...sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch | 50 ++++++++++++++++++++++
.../xorg-xserver/xserver-xorg_1.16.3.bb | 1 +
2 files changed, 51 insertions(+)
create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch
new file mode 100644
index 0000000..215c044
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch
@@ -0,0 +1,50 @@
+Upstream-Status: Pending
+
+From 612eb45a2e7a0b35cc3790870e6d0cc42eb50c74 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Wed, 11 Feb 2015 16:26:40 +0100
+Subject: [PATCH] sdksyms.sh: Make sdksyms.sh work with gcc5.
+
+gcc5's cpp inserts patterns like this:
+
+extern
+ __attribute__((visibility("default")))
+ int WaitForSomething(int *
+ );
+
+This patch make sdksyms.sh work with this. Note my awk skills are weak, so
+there likely is a better way to deal with this.
+
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ hw/xfree86/sdksyms.sh | 17 +++++++++++++++++
+ 1 file changed, 17 insertions(+)
+
+Index: xorg-server-1.16.3/hw/xfree86/sdksyms.sh
+===================================================================
+--- xorg-server-1.16.3.orig/hw/xfree86/sdksyms.sh
++++ xorg-server-1.16.3/hw/xfree86/sdksyms.sh
+@@ -353,6 +353,23 @@ BEGIN {
+ if (sdk) {
+ n = 3;
+
++ # detect the following gcc5 cpp pattern and skip it:
++ # extern
++ # # 320 "../../include/os.h" 3 4
++ # __attribute__((visibility("default")))
++ # # 320 "../../include/os.h"
++ # Note in this case the "extern " or "extern void " always has
++ # a trailing space
++ if ($0 ~ "^extern.* $") {
++ getline;
++ getline;
++ getline;
++ getline;
++ n = 1;
++ while ($n == " ")
++ n++;
++ }
++
+ # skip attribute, if any
+ while ($n ~ /^(__attribute__|__global)/ ||
+ # skip modifiers, if any
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.16.3.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.16.3.bb
index 7eeadd1..780ece0 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.16.3.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.16.3.bb
@@ -9,6 +9,7 @@ SRC_URI += "file://fix_open_max_preprocessor_error.patch \
file://0001-xkb-Don-t-swap-XkbSetGeometry-data-in-the-input-buff.patch \
file://0001-xkb-Check-strings-length-against-request-size.patch \
file://0001-use-__GLIBC__-guard-for-glibc-specific-code.patch \
+ file://0001-sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch \
"
SRC_URI[md5sum] = "afd93977235584a9caa7528a737c1b52"
--
2.1.4
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH 04/14] u-boot-mkimage: Backport fix from upstream to fix build with gcc-5
2015-04-24 3:35 [PATCH 00/14] Fix world build with gcc-5 Khem Raj
` (2 preceding siblings ...)
2015-04-24 3:35 ` [PATCH 03/14] xserver-xorg: Fix build with gcc-5 Khem Raj
@ 2015-04-24 3:35 ` Khem Raj
2015-04-24 3:35 ` [PATCH 05/14] mdadm: Fix inline semantics Khem Raj
` (10 subsequent siblings)
14 siblings, 0 replies; 27+ messages in thread
From: Khem Raj @ 2015-04-24 3:35 UTC (permalink / raw)
To: openembedded-core
Change-Id: I5322f1ff8653009b45ddee1a2d3a0d96584d3327
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/recipes-bsp/u-boot/u-boot-mkimage/gcc5.patch | 91 +++++++++++++++++++++++
meta/recipes-bsp/u-boot/u-boot-mkimage_2015.01.bb | 4 +-
2 files changed, 94 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-bsp/u-boot/u-boot-mkimage/gcc5.patch
diff --git a/meta/recipes-bsp/u-boot/u-boot-mkimage/gcc5.patch b/meta/recipes-bsp/u-boot/u-boot-mkimage/gcc5.patch
new file mode 100644
index 0000000..12db94c
--- /dev/null
+++ b/meta/recipes-bsp/u-boot/u-boot-mkimage/gcc5.patch
@@ -0,0 +1,91 @@
+Upstream-Status: Backport
+
+From 478b02f1a7043b673565075ea5016376f3293b23 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Sat, 7 Feb 2015 22:52:40 +0100
+Subject: [PATCH] Add linux/compiler-gcc5.h to fix builds with gcc5
+
+Add linux/compiler-gcc5/h from the kernel sources at:
+
+commit 5631b8fba640a4ab2f8a954f63a603fa34eda96b
+Author: Steven Noonan <steven@uplinklabs.net>
+Date: Sat Oct 25 15:09:42 2014 -0700
+
+ compiler/gcc4+: Remove inaccurate comment about 'asm goto' miscompiles
+
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ include/linux/compiler-gcc5.h | 65 +++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 65 insertions(+)
+ create mode 100644 include/linux/compiler-gcc5.h
+
+Index: git/include/linux/compiler-gcc5.h
+===================================================================
+--- /dev/null
++++ git/include/linux/compiler-gcc5.h
+@@ -0,0 +1,65 @@
++#ifndef __LINUX_COMPILER_H
++#error "Please don't include <linux/compiler-gcc5.h> directly, include <linux/compiler.h> instead."
++#endif
++
++#define __used __attribute__((__used__))
++#define __must_check __attribute__((warn_unused_result))
++#define __compiler_offsetof(a, b) __builtin_offsetof(a, b)
++
++/* Mark functions as cold. gcc will assume any path leading to a call
++ to them will be unlikely. This means a lot of manual unlikely()s
++ are unnecessary now for any paths leading to the usual suspects
++ like BUG(), printk(), panic() etc. [but let's keep them for now for
++ older compilers]
++
++ Early snapshots of gcc 4.3 don't support this and we can't detect this
++ in the preprocessor, but we can live with this because they're unreleased.
++ Maketime probing would be overkill here.
++
++ gcc also has a __attribute__((__hot__)) to move hot functions into
++ a special section, but I don't see any sense in this right now in
++ the kernel context */
++#define __cold __attribute__((__cold__))
++
++#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__)
++
++#ifndef __CHECKER__
++# define __compiletime_warning(message) __attribute__((warning(message)))
++# define __compiletime_error(message) __attribute__((error(message)))
++#endif /* __CHECKER__ */
++
++/*
++ * Mark a position in code as unreachable. This can be used to
++ * suppress control flow warnings after asm blocks that transfer
++ * control elsewhere.
++ *
++ * Early snapshots of gcc 4.5 don't support this and we can't detect
++ * this in the preprocessor, but we can live with this because they're
++ * unreleased. Really, we need to have autoconf for the kernel.
++ */
++#define unreachable() __builtin_unreachable()
++
++/* Mark a function definition as prohibited from being cloned. */
++#define __noclone __attribute__((__noclone__))
++
++/*
++ * Tell the optimizer that something else uses this function or variable.
++ */
++#define __visible __attribute__((externally_visible))
++
++/*
++ * GCC 'asm goto' miscompiles certain code sequences:
++ *
++ * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670
++ *
++ * Work it around via a compiler barrier quirk suggested by Jakub Jelinek.
++ *
++ * (asm goto is automatically volatile - the naming reflects this.)
++ */
++#define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0)
++
++#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP
++#define __HAVE_BUILTIN_BSWAP32__
++#define __HAVE_BUILTIN_BSWAP64__
++#define __HAVE_BUILTIN_BSWAP16__
++#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */
diff --git a/meta/recipes-bsp/u-boot/u-boot-mkimage_2015.01.bb b/meta/recipes-bsp/u-boot/u-boot-mkimage_2015.01.bb
index 076dff8..7735288 100644
--- a/meta/recipes-bsp/u-boot/u-boot-mkimage_2015.01.bb
+++ b/meta/recipes-bsp/u-boot/u-boot-mkimage_2015.01.bb
@@ -12,7 +12,9 @@ SRCREV = "92fa7f53f1f3f03296f8ffb14bdf1baefab83368"
PV = "v2015.01+git${SRCPV}"
-SRC_URI = "git://git.denx.de/u-boot.git;branch=master"
+SRC_URI = "git://git.denx.de/u-boot.git;branch=master \
+ file://gcc5.patch \
+ "
S = "${WORKDIR}/git"
--
2.1.4
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH 05/14] mdadm: Fix inline semantics
2015-04-24 3:35 [PATCH 00/14] Fix world build with gcc-5 Khem Raj
` (3 preceding siblings ...)
2015-04-24 3:35 ` [PATCH 04/14] u-boot-mkimage: Backport fix from upstream to fix " Khem Raj
@ 2015-04-24 3:35 ` Khem Raj
2015-04-24 3:35 ` [PATCH 06/14] lttng-tools: Add extern qualifier to declarations in .h file Khem Raj
` (9 subsequent siblings)
14 siblings, 0 replies; 27+ messages in thread
From: Khem Raj @ 2015-04-24 3:35 UTC (permalink / raw)
To: openembedded-core
With gcc-5 defaulting to gnu11 C we need to follow
c99 inline semantics
Change-Id: I397520c36c81634556b3f3782aebc532e4a79aed
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/recipes-extended/mdadm/files/inline.patch | 39 ++++++++++++++++++++++++++
meta/recipes-extended/mdadm/mdadm_3.3.2.bb | 1 +
2 files changed, 40 insertions(+)
create mode 100644 meta/recipes-extended/mdadm/files/inline.patch
diff --git a/meta/recipes-extended/mdadm/files/inline.patch b/meta/recipes-extended/mdadm/files/inline.patch
new file mode 100644
index 0000000..9009f06
--- /dev/null
+++ b/meta/recipes-extended/mdadm/files/inline.patch
@@ -0,0 +1,39 @@
+with gnu11 turning on a default with gcc-5 we have to abide by new inline semantics
+using 'inline' and using is in same translation unit means an external definition has to exist
+same like "external inline" in gnu89, we simply make the functions static inline since they
+are just meant to be used in this file
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Index: mdadm-3.3.2/bitmap.c
+===================================================================
+--- mdadm-3.3.2.orig/bitmap.c
++++ mdadm-3.3.2/bitmap.c
+@@ -20,7 +20,7 @@
+
+ #include "mdadm.h"
+
+-inline void sb_le_to_cpu(bitmap_super_t *sb)
++static inline void sb_le_to_cpu(bitmap_super_t *sb)
+ {
+ sb->magic = __le32_to_cpu(sb->magic);
+ sb->version = __le32_to_cpu(sb->version);
+@@ -34,7 +34,7 @@ inline void sb_le_to_cpu(bitmap_super_t
+ sb->write_behind = __le32_to_cpu(sb->write_behind);
+ }
+
+-inline void sb_cpu_to_le(bitmap_super_t *sb)
++static inline void sb_cpu_to_le(bitmap_super_t *sb)
+ {
+ sb_le_to_cpu(sb); /* these are really the same thing */
+ }
+@@ -74,7 +74,7 @@ typedef struct bitmap_info_s {
+ } bitmap_info_t;
+
+ /* count the dirty bits in the first num_bits of byte */
+-inline int count_dirty_bits_byte(char byte, int num_bits)
++static inline int count_dirty_bits_byte(char byte, int num_bits)
+ {
+ int num = 0;
+
diff --git a/meta/recipes-extended/mdadm/mdadm_3.3.2.bb b/meta/recipes-extended/mdadm/mdadm_3.3.2.bb
index 0742d73..87e06f5 100644
--- a/meta/recipes-extended/mdadm/mdadm_3.3.2.bb
+++ b/meta/recipes-extended/mdadm/mdadm_3.3.2.bb
@@ -12,6 +12,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.xz \
file://mdadm-3.2.2_fix_for_x32.patch \
file://gcc-4.9.patch \
file://mdadm-3.3.2_x32_abi_time_t.patch \
+ file://inline.patch \
file://run-ptest \
"
--
2.1.4
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH 06/14] lttng-tools: Add extern qualifier to declarations in .h file
2015-04-24 3:35 [PATCH 00/14] Fix world build with gcc-5 Khem Raj
` (4 preceding siblings ...)
2015-04-24 3:35 ` [PATCH 05/14] mdadm: Fix inline semantics Khem Raj
@ 2015-04-24 3:35 ` Khem Raj
2015-04-24 3:35 ` [PATCH 07/14] subversion: Add -P to CPPFLAGS Khem Raj
` (8 subsequent siblings)
14 siblings, 0 replies; 27+ messages in thread
From: Khem Raj @ 2015-04-24 3:35 UTC (permalink / raw)
To: openembedded-core
This will ensure that compiler does not initialize the definitions
in header files
Change-Id: I1076201c667f96707c320a51a77d4a70e22df750
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../lttng/lttng-tools/extern-decls.patch | 442 +++++++++++++++++++++
meta/recipes-kernel/lttng/lttng-tools_2.6.0.bb | 1 +
2 files changed, 443 insertions(+)
create mode 100644 meta/recipes-kernel/lttng/lttng-tools/extern-decls.patch
diff --git a/meta/recipes-kernel/lttng/lttng-tools/extern-decls.patch b/meta/recipes-kernel/lttng/lttng-tools/extern-decls.patch
new file mode 100644
index 0000000..199ef57
--- /dev/null
+++ b/meta/recipes-kernel/lttng/lttng-tools/extern-decls.patch
@@ -0,0 +1,442 @@
+This make the declarations to be extern so they dont end up
+in duplicates in data.rel.ro sections
+
+avoid errors like
+
+| ../../../src/common/.libs/libcommon.a(mi-lttng.o):(.data.rel.ro.local+0x0): multiple definition of `mi_lttng_element_snapshots'
+| commands/enable_events.o:(.bss+0x48): first defined here
+| collect2: error: ld returned 1 exit status
+| Makefile:502: recipe for target 'lttng' failed
+| make[3]: *** [lttng] Error 1
+
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Index: git/src/common/config/config-session-abi.h
+===================================================================
+--- git.orig/src/common/config/config-session-abi.h
++++ git/src/common/config/config-session-abi.h
+@@ -18,95 +18,95 @@
+ #ifndef CONFIG_SESSION_INTERNAL_H
+ #define CONFIG_SESSION_INTERNAL_H
+
+-const char * const config_element_channel;
+-const char * const config_element_channels;
+-const char * const config_element_domain;
+-const char * const config_element_domains;
+-const char * const config_element_event;
+-const char * const config_element_events;
+-const char * const config_element_context;
+-const char * const config_element_contexts;
+-const char * const config_element_attributes;
+-const char * const config_element_exclusion;
+-const char * const config_element_exclusions;
+-const char * const config_element_function_attributes;
+-const char * const config_element_probe_attributes;
+-const char * const config_element_symbol_name;
+-const char * const config_element_address;
+-const char * const config_element_offset;
+-const char * const config_element_name;
+-const char * const config_element_enabled;
+-const char * const config_element_overwrite_mode;
+-const char * const config_element_subbuf_size;
+-const char * const config_element_num_subbuf;
+-const char * const config_element_switch_timer_interval;
+-const char * const config_element_read_timer_interval;
+-const char * const config_element_output;
+-const char * const config_element_output_type;
+-const char * const config_element_tracefile_size;
+-const char * const config_element_tracefile_count;
+-const char * const config_element_live_timer_interval;
+-const char * const config_element_type;
+-const char * const config_element_buffer_type;
+-const char * const config_element_session;
+-const char * const config_element_sessions;
+-const char * const config_element_perf;
+-const char * const config_element_config;
+-const char * const config_element_started;
+-const char * const config_element_snapshot_mode;
+-const char * const config_element_loglevel;
+-const char * const config_element_loglevel_type;
+-const char * const config_element_filter;
+-const char * const config_element_snapshot_outputs;
+-const char * const config_element_consumer_output;
+-const char * const config_element_destination;
+-const char * const config_element_path;
+-const char * const config_element_net_output;
+-const char * const config_element_control_uri;
+-const char * const config_element_data_uri;
+-const char * const config_element_max_size;
+-
+-const char * const config_domain_type_kernel;
+-const char * const config_domain_type_ust;
+-const char * const config_domain_type_jul;
+-const char * const config_domain_type_log4j;
+-
+-const char * const config_buffer_type_per_pid;
+-const char * const config_buffer_type_per_uid;
+-const char * const config_buffer_type_global;
+-
+-const char * const config_overwrite_mode_discard;
+-const char * const config_overwrite_mode_overwrite;
+-
+-const char * const config_output_type_splice;
+-const char * const config_output_type_mmap;
+-
+-const char * const config_loglevel_type_all;
+-const char * const config_loglevel_type_range;
+-const char * const config_loglevel_type_single;
+-
+-const char * const config_event_type_all;
+-const char * const config_event_type_tracepoint;
+-const char * const config_event_type_probe;
+-const char * const config_event_type_function;
+-const char * const config_event_type_function_entry;
+-const char * const config_event_type_noop;
+-const char * const config_event_type_syscall;
+-const char * const config_event_type_kprobe;
+-const char * const config_event_type_kretprobe;
+-
+-const char * const config_event_context_pid;
+-const char * const config_event_context_procname;
+-const char * const config_event_context_prio;
+-const char * const config_event_context_nice;
+-const char * const config_event_context_vpid;
+-const char * const config_event_context_tid;
+-const char * const config_event_context_vtid;
+-const char * const config_event_context_ppid;
+-const char * const config_event_context_vppid;
+-const char * const config_event_context_pthread_id;
+-const char * const config_event_context_hostname;
+-const char * const config_event_context_ip;
+-const char * const config_event_context_perf_thread_counter;
++extern const char * const config_element_channel;
++extern const char * const config_element_channels;
++extern const char * const config_element_domain;
++extern const char * const config_element_domains;
++extern const char * const config_element_event;
++extern const char * const config_element_events;
++extern const char * const config_element_context;
++extern const char * const config_element_contexts;
++extern const char * const config_element_attributes;
++extern const char * const config_element_exclusion;
++extern const char * const config_element_exclusions;
++extern const char * const config_element_function_attributes;
++extern const char * const config_element_probe_attributes;
++extern const char * const config_element_symbol_name;
++extern const char * const config_element_address;
++extern const char * const config_element_offset;
++extern const char * const config_element_name;
++extern const char * const config_element_enabled;
++extern const char * const config_element_overwrite_mode;
++extern const char * const config_element_subbuf_size;
++extern const char * const config_element_num_subbuf;
++extern const char * const config_element_switch_timer_interval;
++extern const char * const config_element_read_timer_interval;
++extern const char * const config_element_output;
++extern const char * const config_element_output_type;
++extern const char * const config_element_tracefile_size;
++extern const char * const config_element_tracefile_count;
++extern const char * const config_element_live_timer_interval;
++extern const char * const config_element_type;
++extern const char * const config_element_buffer_type;
++extern const char * const config_element_session;
++extern const char * const config_element_sessions;
++extern const char * const config_element_perf;
++extern const char * const config_element_config;
++extern const char * const config_element_started;
++extern const char * const config_element_snapshot_mode;
++extern const char * const config_element_loglevel;
++extern const char * const config_element_loglevel_type;
++extern const char * const config_element_filter;
++extern const char * const config_element_snapshot_outputs;
++extern const char * const config_element_consumer_output;
++extern const char * const config_element_destination;
++extern const char * const config_element_path;
++extern const char * const config_element_net_output;
++extern const char * const config_element_control_uri;
++extern const char * const config_element_data_uri;
++extern const char * const config_element_max_size;
++
++extern const char * const config_domain_type_kernel;
++extern const char * const config_domain_type_ust;
++extern const char * const config_domain_type_jul;
++extern const char * const config_domain_type_log4j;
++
++extern const char * const config_buffer_type_per_pid;
++extern const char * const config_buffer_type_per_uid;
++extern const char * const config_buffer_type_global;
++
++extern const char * const config_overwrite_mode_discard;
++extern const char * const config_overwrite_mode_overwrite;
++
++extern const char * const config_output_type_splice;
++extern const char * const config_output_type_mmap;
++
++extern const char * const config_loglevel_type_all;
++extern const char * const config_loglevel_type_range;
++extern const char * const config_loglevel_type_single;
++
++extern const char * const config_event_type_all;
++extern const char * const config_event_type_tracepoint;
++extern const char * const config_event_type_probe;
++extern const char * const config_event_type_function;
++extern const char * const config_event_type_function_entry;
++extern const char * const config_event_type_noop;
++extern const char * const config_event_type_syscall;
++extern const char * const config_event_type_kprobe;
++extern const char * const config_event_type_kretprobe;
++
++extern const char * const config_event_context_pid;
++extern const char * const config_event_context_procname;
++extern const char * const config_event_context_prio;
++extern const char * const config_event_context_nice;
++extern const char * const config_event_context_vpid;
++extern const char * const config_event_context_tid;
++extern const char * const config_event_context_vtid;
++extern const char * const config_event_context_ppid;
++extern const char * const config_event_context_vppid;
++extern const char * const config_event_context_pthread_id;
++extern const char * const config_event_context_hostname;
++extern const char * const config_event_context_ip;
++extern const char * const config_event_context_perf_thread_counter;
+
+ #endif /* CONFIG_SESSION_INTERNAL_H */
+Index: git/src/common/mi-lttng.h
+===================================================================
+--- git.orig/src/common/mi-lttng.h
++++ git/src/common/mi-lttng.h
+@@ -49,133 +49,133 @@ struct mi_lttng_version {
+ };
+
+ /* Strings related to command */
+-const char * const mi_lttng_element_command;
+-const char * const mi_lttng_element_command_action;
+-const char * const mi_lttng_element_command_add_context;
+-const char * const mi_lttng_element_command_calibrate;
+-const char * const mi_lttng_element_command_create;
+-const char * const mi_lttng_element_command_destroy;
+-const char * const mi_lttng_element_command_disable_channel;
+-const char * const mi_lttng_element_command_disable_event;
+-const char * const mi_lttng_element_command_enable_channels;
+-const char * const mi_lttng_element_command_enable_event;
+-const char * const mi_lttng_element_command_list;
+-const char * const mi_lttng_element_command_load;
+-const char * const mi_lttng_element_command_name;
+-const char * const mi_lttng_element_command_output;
+-const char * const mi_lttng_element_command_save;
+-const char * const mi_lttng_element_command_set_session;
+-const char * const mi_lttng_element_command_snapshot;
+-const char * const mi_lttng_element_command_snapshot_add;
+-const char * const mi_lttng_element_command_snapshot_del;
+-const char * const mi_lttng_element_command_snapshot_list;
+-const char * const mi_lttng_element_command_snapshot_record;
+-const char * const mi_lttng_element_command_start;
+-const char * const mi_lttng_element_command_stop;
+-const char * const mi_lttng_element_command_success;
+-const char * const mi_lttng_element_command_version;
++extern const char * const mi_lttng_element_command;
++extern const char * const mi_lttng_element_command_action;
++extern const char * const mi_lttng_element_command_add_context;
++extern const char * const mi_lttng_element_command_calibrate;
++extern const char * const mi_lttng_element_command_create;
++extern const char * const mi_lttng_element_command_destroy;
++extern const char * const mi_lttng_element_command_disable_channel;
++extern const char * const mi_lttng_element_command_disable_event;
++extern const char * const mi_lttng_element_command_enable_channels;
++extern const char * const mi_lttng_element_command_enable_event;
++extern const char * const mi_lttng_element_command_list;
++extern const char * const mi_lttng_element_command_load;
++extern const char * const mi_lttng_element_command_name;
++extern const char * const mi_lttng_element_command_output;
++extern const char * const mi_lttng_element_command_save;
++extern const char * const mi_lttng_element_command_set_session;
++extern const char * const mi_lttng_element_command_snapshot;
++extern const char * const mi_lttng_element_command_snapshot_add;
++extern const char * const mi_lttng_element_command_snapshot_del;
++extern const char * const mi_lttng_element_command_snapshot_list;
++extern const char * const mi_lttng_element_command_snapshot_record;
++extern const char * const mi_lttng_element_command_start;
++extern const char * const mi_lttng_element_command_stop;
++extern const char * const mi_lttng_element_command_success;
++extern const char * const mi_lttng_element_command_version;
+
+ /* Strings related to version command */
+-const char * const mi_lttng_element_version;
+-const char * const mi_lttng_element_version_commit;
+-const char * const mi_lttng_element_version_description;
+-const char * const mi_lttng_element_version_license;
+-const char * const mi_lttng_element_version_major;
+-const char * const mi_lttng_element_version_minor;
+-const char * const mi_lttng_element_version_patch_level;
+-const char * const mi_lttng_element_version_str;
+-const char * const mi_lttng_element_version_web;
++extern const char * const mi_lttng_element_version;
++extern const char * const mi_lttng_element_version_commit;
++extern const char * const mi_lttng_element_version_description;
++extern const char * const mi_lttng_element_version_license;
++extern const char * const mi_lttng_element_version_major;
++extern const char * const mi_lttng_element_version_minor;
++extern const char * const mi_lttng_element_version_patch_level;
++extern const char * const mi_lttng_element_version_str;
++extern const char * const mi_lttng_element_version_web;
+
+ /* String related to a lttng_event_field */
+-const char * const mi_lttng_element_event_field;
+-const char * const mi_lttng_element_event_fields;
++extern const char * const mi_lttng_element_event_field;
++extern const char * const mi_lttng_element_event_fields;
+
+ /* String related to lttng_event_context */
+-const char * const mi_lttng_context_type_perf_counter;
+-const char * const mi_lttng_context_type_perf_cpu_counter;
+-const char * const mi_lttng_context_type_perf_thread_counter;
++extern const char * const mi_lttng_context_type_perf_counter;
++extern const char * const mi_lttng_context_type_perf_cpu_counter;
++extern const char * const mi_lttng_context_type_perf_thread_counter;
+
+ /* String related to lttng_event_perf_counter_ctx */
+-const char * const mi_lttng_element_perf_counter_context;
++extern const char * const mi_lttng_element_perf_counter_context;
+
+ /* Strings related to pid */
+-const char * const mi_lttng_element_pids;
+-const char * const mi_lttng_element_pid;
+-const char * const mi_lttng_element_pid_id;
++extern const char * const mi_lttng_element_pids;
++extern const char * const mi_lttng_element_pid;
++extern const char * const mi_lttng_element_pid_id;
+
+ /* Strings related to save command */
+-const char * const mi_lttng_element_save;
++extern const char * const mi_lttng_element_save;
+
+ /* Strings related to load command */
+-const char * const mi_lttng_element_load;
++extern const char * const mi_lttng_element_load;
+
+ /* General element of mi_lttng */
+-const char * const mi_lttng_element_empty;
+-const char * const mi_lttng_element_id;
+-const char * const mi_lttng_element_nowrite;
+-const char * const mi_lttng_element_success;
+-const char * const mi_lttng_element_type_enum;
+-const char * const mi_lttng_element_type_float;
+-const char * const mi_lttng_element_type_integer;
+-const char * const mi_lttng_element_type_other;
+-const char * const mi_lttng_element_type_string;
++extern const char * const mi_lttng_element_empty;
++extern const char * const mi_lttng_element_id;
++extern const char * const mi_lttng_element_nowrite;
++extern const char * const mi_lttng_element_success;
++extern const char * const mi_lttng_element_type_enum;
++extern const char * const mi_lttng_element_type_float;
++extern const char * const mi_lttng_element_type_integer;
++extern const char * const mi_lttng_element_type_other;
++extern const char * const mi_lttng_element_type_string;
+
+ /* String related to loglevel */
+-const char * const mi_lttng_loglevel_str_alert;
+-const char * const mi_lttng_loglevel_str_crit;
+-const char * const mi_lttng_loglevel_str_debug;
+-const char * const mi_lttng_loglevel_str_debug_function;
+-const char * const mi_lttng_loglevel_str_debug_line;
+-const char * const mi_lttng_loglevel_str_debug_module;
+-const char * const mi_lttng_loglevel_str_debug_process;
+-const char * const mi_lttng_loglevel_str_debug_program;
+-const char * const mi_lttng_loglevel_str_debug_system;
+-const char * const mi_lttng_loglevel_str_debug_unit;
+-const char * const mi_lttng_loglevel_str_emerg;
+-const char * const mi_lttng_loglevel_str_err;
+-const char * const mi_lttng_loglevel_str_info;
+-const char * const mi_lttng_loglevel_str_notice;
+-const char * const mi_lttng_loglevel_str_unknown;
+-const char * const mi_lttng_loglevel_str_warning;
++extern const char * const mi_lttng_loglevel_str_alert;
++extern const char * const mi_lttng_loglevel_str_crit;
++extern const char * const mi_lttng_loglevel_str_debug;
++extern const char * const mi_lttng_loglevel_str_debug_function;
++extern const char * const mi_lttng_loglevel_str_debug_line;
++extern const char * const mi_lttng_loglevel_str_debug_module;
++extern const char * const mi_lttng_loglevel_str_debug_process;
++extern const char * const mi_lttng_loglevel_str_debug_program;
++extern const char * const mi_lttng_loglevel_str_debug_system;
++extern const char * const mi_lttng_loglevel_str_debug_unit;
++extern const char * const mi_lttng_loglevel_str_emerg;
++extern const char * const mi_lttng_loglevel_str_err;
++extern const char * const mi_lttng_loglevel_str_info;
++extern const char * const mi_lttng_loglevel_str_notice;
++extern const char * const mi_lttng_loglevel_str_unknown;
++extern const char * const mi_lttng_loglevel_str_warning;
+
+ /* String related to loglevel JUL */
+-const char * const mi_lttng_loglevel_str_jul_all;
+-const char * const mi_lttng_loglevel_str_jul_config;
+-const char * const mi_lttng_loglevel_str_jul_fine;
+-const char * const mi_lttng_loglevel_str_jul_finer;
+-const char * const mi_lttng_loglevel_str_jul_finest;
+-const char * const mi_lttng_loglevel_str_jul_info;
+-const char * const mi_lttng_loglevel_str_jul_off;
+-const char * const mi_lttng_loglevel_str_jul_severe;
+-const char * const mi_lttng_loglevel_str_jul_warning;
++extern const char * const mi_lttng_loglevel_str_jul_all;
++extern const char * const mi_lttng_loglevel_str_jul_config;
++extern const char * const mi_lttng_loglevel_str_jul_fine;
++extern const char * const mi_lttng_loglevel_str_jul_finer;
++extern const char * const mi_lttng_loglevel_str_jul_finest;
++extern const char * const mi_lttng_loglevel_str_jul_info;
++extern const char * const mi_lttng_loglevel_str_jul_off;
++extern const char * const mi_lttng_loglevel_str_jul_severe;
++extern const char * const mi_lttng_loglevel_str_jul_warning;
+
+ /* String related to loglevel Log4j */
+-const char * const mi_lttng_loglevel_str_log4j_off;
+-const char * const mi_lttng_loglevel_str_log4j_fatal;
+-const char * const mi_lttng_loglevel_str_log4j_error;
+-const char * const mi_lttng_loglevel_str_log4j_warn;
+-const char * const mi_lttng_loglevel_str_log4j_info;
+-const char * const mi_lttng_loglevel_str_log4j_debug;
+-const char * const mi_lttng_loglevel_str_log4j_trace;
+-const char * const mi_lttng_loglevel_str_log4j_all;
++extern const char * const mi_lttng_loglevel_str_log4j_off;
++extern const char * const mi_lttng_loglevel_str_log4j_fatal;
++extern const char * const mi_lttng_loglevel_str_log4j_error;
++extern const char * const mi_lttng_loglevel_str_log4j_warn;
++extern const char * const mi_lttng_loglevel_str_log4j_info;
++extern const char * const mi_lttng_loglevel_str_log4j_debug;
++extern const char * const mi_lttng_loglevel_str_log4j_trace;
++extern const char * const mi_lttng_loglevel_str_log4j_all;
+
+ /* String related to loglevel type */
+-const char * const mi_lttng_loglevel_type_all;
+-const char * const mi_lttng_loglevel_type_range;
+-const char * const mi_lttng_loglevel_type_single;
+-const char * const mi_lttng_loglevel_type_unknown;
++extern const char * const mi_lttng_loglevel_type_all;
++extern const char * const mi_lttng_loglevel_type_range;
++extern const char * const mi_lttng_loglevel_type_single;
++extern const char * const mi_lttng_loglevel_type_unknown;
+
+ /* Sting related to lttng_calibrate */
+-const char * const mi_lttng_element_calibrate;
+-const char * const mi_lttng_element_calibrate_function;
++extern const char * const mi_lttng_element_calibrate;
++extern const char * const mi_lttng_element_calibrate_function;
+
+ /* String related to a lttng_snapshot */
+-const char * const mi_lttng_element_snapshot_ctrl_url;
+-const char * const mi_lttng_element_snapshot_data_url;
+-const char * const mi_lttng_element_snapshot_max_size;
+-const char * const mi_lttng_element_snapshot_n_ptr;
+-const char * const mi_lttng_element_snapshot_session_name;
+-const char * const mi_lttng_element_snapshots;
++extern const char * const mi_lttng_element_snapshot_ctrl_url;
++extern const char * const mi_lttng_element_snapshot_data_url;
++extern const char * const mi_lttng_element_snapshot_max_size;
++extern const char * const mi_lttng_element_snapshot_n_ptr;
++extern const char * const mi_lttng_element_snapshot_session_name;
++extern const char * const mi_lttng_element_snapshots;
+
+ /* Utility string function */
+ const char *mi_lttng_loglevel_string(int value, enum lttng_domain_type domain);
diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.6.0.bb b/meta/recipes-kernel/lttng/lttng-tools_2.6.0.bb
index f0969b5..8cc4220 100644
--- a/meta/recipes-kernel/lttng/lttng-tools_2.6.0.bb
+++ b/meta/recipes-kernel/lttng/lttng-tools_2.6.0.bb
@@ -25,6 +25,7 @@ PACKAGECONFIG[kmod] = "--enable-kmod, --disable-kmod, kmod"
SRC_URI = "git://git.lttng.org/lttng-tools.git;branch=stable-2.6 \
file://runtest-2.4.0.patch \
+ file://extern-decls.patch \
file://run-ptest \
"
--
2.1.4
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH 07/14] subversion: Add -P to CPPFLAGS
2015-04-24 3:35 [PATCH 00/14] Fix world build with gcc-5 Khem Raj
` (5 preceding siblings ...)
2015-04-24 3:35 ` [PATCH 06/14] lttng-tools: Add extern qualifier to declarations in .h file Khem Raj
@ 2015-04-24 3:35 ` Khem Raj
2015-04-27 15:03 ` Burton, Ross
2015-04-24 3:35 ` [PATCH 08/14] gnome-icon-theme: Needs nls.m4 Khem Raj
` (7 subsequent siblings)
14 siblings, 1 reply; 27+ messages in thread
From: Khem Raj @ 2015-04-24 3:35 UTC (permalink / raw)
To: openembedded-core
see https://gcc.gnu.org/gcc-5/porting_to.html
we need to stop the preprocessor from generating the #line directives
or we run into issues like
| checking for apr_int64_t Python/C API format string...
| configure: error: failed to recognize APR_INT64_T_FMT on this platform
| Configure failed. The contents of all config.log files follows to aid
debugging
| ERROR: oe_runconf failed
Rightly subversion should be fixed but lets leave that to subversion
folks
Change-Id: I02a89798ff949f79967ab0a73adcddaa4218662d
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/recipes-devtools/subversion/subversion_1.8.11.bb | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/subversion/subversion_1.8.11.bb b/meta/recipes-devtools/subversion/subversion_1.8.11.bb
index 8e4cd9d..d5295d8 100644
--- a/meta/recipes-devtools/subversion/subversion_1.8.11.bb
+++ b/meta/recipes-devtools/subversion/subversion_1.8.11.bb
@@ -7,7 +7,7 @@ HOMEPAGE = "http://subversion.tigris.org"
BBCLASSEXTEND = "native"
-inherit gettext
+inherit gettext pythonnative
SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
file://libtool2.patch \
@@ -31,6 +31,7 @@ EXTRA_OECONF = " \
inherit autotools
export LDFLAGS += " -L${STAGING_LIBDIR} "
+CPPFLAGS += "-P"
acpaths = "-I build/ -I build/ac-macros/"
--
2.1.4
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH 08/14] gnome-icon-theme: Needs nls.m4
2015-04-24 3:35 [PATCH 00/14] Fix world build with gcc-5 Khem Raj
` (6 preceding siblings ...)
2015-04-24 3:35 ` [PATCH 07/14] subversion: Add -P to CPPFLAGS Khem Raj
@ 2015-04-24 3:35 ` Khem Raj
2015-04-24 3:35 ` [PATCH 09/14] gtk+: Correct function prototype Khem Raj
` (6 subsequent siblings)
14 siblings, 0 replies; 27+ messages in thread
From: Khem Raj @ 2015-04-24 3:35 UTC (permalink / raw)
To: openembedded-core
it really needs nls, so lets add proper dependencies
and options
Change-Id: Ib01f066e9dadf2784686cbe28578d2784dfcba88
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb b/meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb
index ee018bd..fde2bc0 100644
--- a/meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb
+++ b/meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb
@@ -10,7 +10,7 @@ PR = "r5"
DEPENDS = "icon-naming-utils-native glib-2.0 intltool-native libxml-simple-perl-native"
-inherit autotools perlnative gtk-icon-cache pkgconfig
+inherit autotools perlnative gtk-icon-cache pkgconfig gettext
SRC_URI = "${GNOME_MIRROR}/${BPN}/2.31/${BPN}-${PV}.tar.bz2 \
file://iconpath-option.patch"
--
2.1.4
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH 09/14] gtk+: Correct function prototype
2015-04-24 3:35 [PATCH 00/14] Fix world build with gcc-5 Khem Raj
` (7 preceding siblings ...)
2015-04-24 3:35 ` [PATCH 08/14] gnome-icon-theme: Needs nls.m4 Khem Raj
@ 2015-04-24 3:35 ` Khem Raj
2015-04-24 3:35 ` [PATCH 10/14] grub: Backport const qualifier fix for gcc-5 Khem Raj
` (5 subsequent siblings)
14 siblings, 0 replies; 27+ messages in thread
From: Khem Raj @ 2015-04-24 3:35 UTC (permalink / raw)
To: openembedded-core
This is turned on by default in gcc-5 so far
we have been getting by this issue but time to fix it
has now come
Change-Id: I012248731de0be7a9b7e232073746360fe6c83dd
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../gtk+/gtk+/strict-prototypes.patch | 24 ++++++++++++++++++++++
meta/recipes-gnome/gtk+/gtk+_2.24.27.bb | 1 +
2 files changed, 25 insertions(+)
create mode 100644 meta/recipes-gnome/gtk+/gtk+/strict-prototypes.patch
diff --git a/meta/recipes-gnome/gtk+/gtk+/strict-prototypes.patch b/meta/recipes-gnome/gtk+/gtk+/strict-prototypes.patch
new file mode 100644
index 0000000..96e1f5f
--- /dev/null
+++ b/meta/recipes-gnome/gtk+/gtk+/strict-prototypes.patch
@@ -0,0 +1,24 @@
+Fixes
+
+include/gtk-2.0/gtk/gtkitemfactory.h:47:1: warning: function declaration isn't a prototype [-Wstrict-prototypes]
+ typedef void (*GtkItemFactoryCallback) ();
+
+gcc5 has -Wstrict-prototypes on by default for -Werror so this becomes a build failure for consumers
+of this header e.g. matchbox-panel-2
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Index: gtk+-2.24.27/gtk/gtkitemfactory.h
+===================================================================
+--- gtk+-2.24.27.orig/gtk/gtkitemfactory.h
++++ gtk+-2.24.27/gtk/gtkitemfactory.h
+@@ -44,7 +44,7 @@ typedef void (*GtkPrintFunc) (gpoint
+ * (Note that if we are included from a C++ program () will mean
+ * (void) so an explicit cast will be needed.)
+ */
+-typedef void (*GtkItemFactoryCallback) ();
++typedef void (*GtkItemFactoryCallback) (void);
+ typedef void (*GtkItemFactoryCallback1) (gpointer callback_data,
+ guint callback_action,
+ GtkWidget *widget);
diff --git a/meta/recipes-gnome/gtk+/gtk+_2.24.27.bb b/meta/recipes-gnome/gtk+/gtk+_2.24.27.bb
index b2693d5..4f664e4 100644
--- a/meta/recipes-gnome/gtk+/gtk+_2.24.27.bb
+++ b/meta/recipes-gnome/gtk+/gtk+_2.24.27.bb
@@ -9,6 +9,7 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${PV}.tar.xz \
file://hardcoded_libtool.patch \
file://toggle-font.diff;striplevel=0 \
file://doc-fixes.patch \
+ file://strict-prototypes.patch \
"
SRC_URI[md5sum] = "b1e890e15602c5bcb40d85b13fe046fd"
--
2.1.4
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH 10/14] grub: Backport const qualifier fix for gcc-5
2015-04-24 3:35 [PATCH 00/14] Fix world build with gcc-5 Khem Raj
` (8 preceding siblings ...)
2015-04-24 3:35 ` [PATCH 09/14] gtk+: Correct function prototype Khem Raj
@ 2015-04-24 3:35 ` Khem Raj
2015-04-24 3:35 ` [PATCH 11/14] gummiboot: upgrade 43 -> 48+git Khem Raj
` (4 subsequent siblings)
14 siblings, 0 replies; 27+ messages in thread
From: Khem Raj @ 2015-04-24 3:35 UTC (permalink / raw)
To: openembedded-core
gcc-5 is stricter and complains about const to non-const
conversions, we backport the patch from upstream into 2.00
Change-Id: I17db365fdd253daaa1ab726e2a70ecad0ac7b2ae
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
..._dhcp_vendor-Add-missing-const-qualifiers.patch | 33 ++++++++++++++++++++++
meta/recipes-bsp/grub/grub2.inc | 1 +
2 files changed, 34 insertions(+)
create mode 100644 meta/recipes-bsp/grub/files/0001-parse_dhcp_vendor-Add-missing-const-qualifiers.patch
diff --git a/meta/recipes-bsp/grub/files/0001-parse_dhcp_vendor-Add-missing-const-qualifiers.patch b/meta/recipes-bsp/grub/files/0001-parse_dhcp_vendor-Add-missing-const-qualifiers.patch
new file mode 100644
index 0000000..255e3eb
--- /dev/null
+++ b/meta/recipes-bsp/grub/files/0001-parse_dhcp_vendor-Add-missing-const-qualifiers.patch
@@ -0,0 +1,33 @@
+Upstream-Status: Backport
+
+Original commit: http://git.savannah.gnu.org/cgit/grub.git/commit/grub-core/net/bootp.c?id=f06c2172c0b32052f22e37523445cf8e7affaea3
+
+From 149d2a14f4723778ced23f439487201ccbf1a2c9 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Thu, 23 Apr 2015 07:03:34 +0000
+Subject: [PATCH] parse_dhcp_vendor: Add missing const qualifiers.
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ grub-core/net/bootp.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c
+index bc07d53..44131ed 100644
+--- a/grub-core/net/bootp.c
++++ b/grub-core/net/bootp.c
+@@ -52,9 +52,9 @@ set_env_limn_ro (const char *intername, const char *suffix,
+ }
+
+ static void
+-parse_dhcp_vendor (const char *name, void *vend, int limit, int *mask)
++parse_dhcp_vendor (const char *name, const void *vend, int limit, int *mask)
+ {
+- grub_uint8_t *ptr, *ptr0;
++ const grub_uint8_t *ptr, *ptr0;
+
+ ptr = ptr0 = vend;
+
+--
+2.1.4
+
diff --git a/meta/recipes-bsp/grub/grub2.inc b/meta/recipes-bsp/grub/grub2.inc
index 08c0b6b..add4586 100644
--- a/meta/recipes-bsp/grub/grub2.inc
+++ b/meta/recipes-bsp/grub/grub2.inc
@@ -25,6 +25,7 @@ SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \
file://grub-efi-allow-a-compilation-without-mcmodel-large.patch \
file://grub-efi-fix-with-glibc-2.20.patch \
file://0001-Unset-need_charset_alias-when-building-for-musl.patch \
+ file://0001-parse_dhcp_vendor-Add-missing-const-qualifiers.patch \
"
DEPENDS = "flex-native bison-native xz"
--
2.1.4
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH 11/14] gummiboot: upgrade 43 -> 48+git
2015-04-24 3:35 [PATCH 00/14] Fix world build with gcc-5 Khem Raj
` (9 preceding siblings ...)
2015-04-24 3:35 ` [PATCH 10/14] grub: Backport const qualifier fix for gcc-5 Khem Raj
@ 2015-04-24 3:35 ` Khem Raj
2015-04-24 3:35 ` [PATCH 12/14] pkgconfig: Upgrade to latest git tip Khem Raj
` (3 subsequent siblings)
14 siblings, 0 replies; 27+ messages in thread
From: Khem Raj @ 2015-04-24 3:35 UTC (permalink / raw)
To: openembedded-core
43 does not compile with gcc-5
Refresh objcopy patch to incorporate latest changes
Change-Id: Ied41ed1335bb1db3438b98121e05c22242a8a13e
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../gummiboot/gummiboot/fix-objcopy.patch | 28 +++++++++++++---------
meta/recipes-bsp/gummiboot/gummiboot_git.bb | 4 ++--
2 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/meta/recipes-bsp/gummiboot/gummiboot/fix-objcopy.patch b/meta/recipes-bsp/gummiboot/gummiboot/fix-objcopy.patch
index 2683f83..49f5593 100644
--- a/meta/recipes-bsp/gummiboot/gummiboot/fix-objcopy.patch
+++ b/meta/recipes-bsp/gummiboot/gummiboot/fix-objcopy.patch
@@ -12,10 +12,10 @@ Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Makefile.am | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
-diff --git a/Makefile.am b/Makefile.am
-index d224418..dcd95b0 100644
---- a/Makefile.am
-+++ b/Makefile.am
+Index: git/Makefile.am
+===================================================================
+--- git.orig/Makefile.am
++++ git/Makefile.am
@@ -19,6 +19,8 @@
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
AM_MAKEFLAGS = --no-print-directory
@@ -25,15 +25,21 @@ index d224418..dcd95b0 100644
gummibootlibdir = $(prefix)/lib/gummiboot
AM_CPPFLAGS = -include config.h
-@@ -143,7 +145,7 @@ $(efi_solib): $(efi_objects)
- .DELETE_ON_ERROR: $(efi_solib)
+@@ -148,7 +150,7 @@ $(gummiboot_solib): $(gummiboot_objects)
+ .DELETE_ON_ERROR: $(gummboot_solib)
- $(efi_loadername): $(efi_solib)
+ $(gummiboot): $(gummiboot_solib)
- $(AM_V_GEN) objcopy -j .text -j .sdata -j .data -j .dynamic \
+ $(AM_V_GEN) $(OBJCOPY) -j .text -j .sdata -j .data -j .dynamic \
- -j .dynsym -j .rel -j .rela -j .reloc -j .eh_frame \
+ -j .dynsym -j .rel -j .rela -j .reloc \
+ --target=efi-app-$(ARCH) $< $@
+
+@@ -183,7 +185,7 @@ $(stub_solib): $(stub_objects)
+ .DELETE_ON_ERROR: $(gummboot_solib)
+
+ $(stub): $(stub_solib)
+- $(AM_V_GEN) objcopy -j .text -j .sdata -j .data -j .dynamic \
++ $(AM_V_GEN) $(OBJCOPY) -j .text -j .sdata -j .data -j .dynamic \
+ -j .dynsym -j .rel -j .rela -j .reloc \
--target=efi-app-$(ARCH) $< $@
---
-1.8.3.4
-
diff --git a/meta/recipes-bsp/gummiboot/gummiboot_git.bb b/meta/recipes-bsp/gummiboot/gummiboot_git.bb
index 7fc908e..91c3db9 100644
--- a/meta/recipes-bsp/gummiboot/gummiboot_git.bb
+++ b/meta/recipes-bsp/gummiboot/gummiboot_git.bb
@@ -9,8 +9,8 @@ DEPENDS = "gnu-efi util-linux"
inherit autotools pkgconfig
inherit deploy
-PV = "43+git${SRCPV}"
-SRCREV = "4062c51075ba054d4949c714fe06123f9ad3097d"
+PV = "48+git${SRCPV}"
+SRCREV = "2bcd919c681c952eb867ef1bdb458f1bc49c2d55"
SRC_URI = "git://anongit.freedesktop.org/gummiboot \
file://fix-objcopy.patch \
"
--
2.1.4
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH 12/14] pkgconfig: Upgrade to latest git tip
2015-04-24 3:35 [PATCH 00/14] Fix world build with gcc-5 Khem Raj
` (10 preceding siblings ...)
2015-04-24 3:35 ` [PATCH 11/14] gummiboot: upgrade 43 -> 48+git Khem Raj
@ 2015-04-24 3:35 ` Khem Raj
2015-04-24 3:35 ` [PATCH 13/14] fontconfig: Upgrade to 2.11.93 Khem Raj
` (2 subsequent siblings)
14 siblings, 0 replies; 27+ messages in thread
From: Khem Raj @ 2015-04-24 3:35 UTC (permalink / raw)
To: openembedded-core
0.28 was released 2 years ago and bunch of patches
have gone in since. The commit rate is quite low
so its not a lot of churn to use. We have backports
for few bugs that are removed. Git version of recipe is removed too
since its no longer needed
Change-Id: I4b57db15320c76b1de5d26a733e60436663ff34a
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
...Strip-system-library-directories-reliably.patch | 30 --
.../pkgconfig/pkgconfig-0.28/autofoo.patch | 528 ---------------------
.../pkgconfig-0.28/obsolete_automake_macros.patch | 16 -
meta/recipes-devtools/pkgconfig/pkgconfig.inc | 6 +-
.../pkgconfig/pkgconfig/autofoo.patch | 528 ---------------------
.../fix-glib-configure-libtool-usage.patch | 0
meta/recipes-devtools/pkgconfig/pkgconfig_0.28.bb | 11 -
meta/recipes-devtools/pkgconfig/pkgconfig_git.bb | 42 +-
8 files changed, 8 insertions(+), 1153 deletions(-)
delete mode 100644 meta/recipes-devtools/pkgconfig/pkgconfig-0.28/0001-Strip-system-library-directories-reliably.patch
delete mode 100644 meta/recipes-devtools/pkgconfig/pkgconfig-0.28/autofoo.patch
delete mode 100644 meta/recipes-devtools/pkgconfig/pkgconfig-0.28/obsolete_automake_macros.patch
delete mode 100644 meta/recipes-devtools/pkgconfig/pkgconfig/autofoo.patch
rename meta/recipes-devtools/pkgconfig/{pkgconfig-0.28 => pkgconfig}/fix-glib-configure-libtool-usage.patch (100%)
delete mode 100644 meta/recipes-devtools/pkgconfig/pkgconfig_0.28.bb
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig-0.28/0001-Strip-system-library-directories-reliably.patch b/meta/recipes-devtools/pkgconfig/pkgconfig-0.28/0001-Strip-system-library-directories-reliably.patch
deleted file mode 100644
index 84d0dd8..0000000
--- a/meta/recipes-devtools/pkgconfig/pkgconfig-0.28/0001-Strip-system-library-directories-reliably.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Upstream-Status: Backport (will be in 0.29)
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-From ce1a2416ce0f0bd9a8a8a5caaf7dad20cda4d47d Mon Sep 17 00:00:00 2001
-From: Andrew Oakley <aoakley@espial.com>
-Date: Tue, 29 Apr 2014 13:14:35 +0100
-Subject: [PATCH] Strip system library directories reliably
-
-This loop was changed from a while loop to a for loop in commit
-9bf6277b, but the iterator is now advanced twice each time round the
-loop.
----
- pkg.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/pkg.c b/pkg.c
-index 3697fec..c847c95 100644
---- a/pkg.c
-+++ b/pkg.c
-@@ -917,7 +917,6 @@ verify_package (Package *pkg)
- }
- system_dir_iter = system_dir_iter->next;
- }
-- iter = iter->next;
- }
- g_list_free (system_directories);
-
---
-1.7.10.4
-
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig-0.28/autofoo.patch b/meta/recipes-devtools/pkgconfig/pkgconfig-0.28/autofoo.patch
deleted file mode 100644
index 9853577..0000000
--- a/meta/recipes-devtools/pkgconfig/pkgconfig-0.28/autofoo.patch
+++ /dev/null
@@ -1,528 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
----
- glib-1.2.10/acglib.m4 | 12 +-
- glib-1.2.10/configure.in | 212 ++++++++++++++++++++++++++++++------------------
- 2 files changed, 140 insertions(+), 84 deletions(-)
-
-Index: pkg-config-0.23/glib-1.2.10/acglib.m4
-===================================================================
---- pkg-config-0.23.orig/glib-1.2.10/acglib.m4 2008-01-16 22:52:24.000000000 +0000
-+++ pkg-config-0.23/glib-1.2.10/acglib.m4 2008-03-26 20:59:12.000000000 +0000
-@@ -10,7 +10,7 @@
- AC_DIVERT_POP()])])])
-
- dnl GLIB_IF_VAR_EQ (ENV_VAR, VALUE [, EQUALS_ACTION] [, ELSE_ACTION])
--AC_DEFUN(GLIB_IF_VAR_EQ,[
-+AC_DEFUN([GLIB_IF_VAR_EQ],[
- case "$[$1]" in
- "[$2]"[)]
- [$3]
-@@ -21,7 +21,7 @@
- esac
- ])
- dnl GLIB_STR_CONTAINS (SRC_STRING, SUB_STRING [, CONTAINS_ACTION] [, ELSE_ACTION])
--AC_DEFUN(GLIB_STR_CONTAINS,[
-+AC_DEFUN([GLIB_STR_CONTAINS],[
- case "[$1]" in
- *"[$2]"*[)]
- [$3]
-@@ -32,12 +32,12 @@
- esac
- ])
- dnl GLIB_ADD_TO_VAR (ENV_VARIABLE, CHECK_STRING, ADD_STRING)
--AC_DEFUN(GLIB_ADD_TO_VAR,[
-+AC_DEFUN([GLIB_ADD_TO_VAR],[
- GLIB_STR_CONTAINS($[$1], [$2], [$1]="$[$1]", [$1]="$[$1] [$3]")
- ])
-
- dnl GLIB_SIZEOF (INCLUDES, TYPE, ALIAS [, CROSS-SIZE])
--AC_DEFUN(GLIB_SIZEOF,
-+AC_DEFUN([GLIB_SIZEOF],
- [changequote(<<, >>)dnl
- dnl The name to #define.
- define(<<AC_TYPE_NAME>>, translit(glib_sizeof_$3, [a-z *], [A-Z_P]))dnl
-@@ -62,7 +62,7 @@
- ])
-
- dnl GLIB_BYTE_CONTENTS (INCLUDES, TYPE, ALIAS, N_BYTES, INITIALIZER)
--AC_DEFUN(GLIB_BYTE_CONTENTS,
-+AC_DEFUN([GLIB_BYTE_CONTENTS],
- [changequote(<<, >>)dnl
- dnl The name to #define.
- define(<<AC_TYPE_NAME>>, translit(glib_byte_contents_$3, [a-z *], [A-Z_P]))dnl
-@@ -92,7 +92,7 @@
- ])
-
- dnl GLIB_SYSDEFS (INCLUDES, DEFS_LIST, OFILE [, PREFIX])
--AC_DEFUN(GLIB_SYSDEFS,
-+AC_DEFUN([GLIB_SYSDEFS],
- [glib_sysdefso="translit($3, [-_a-zA-Z0-9 *], [-_a-zA-Z0-9])"
- glib_sysdef_msg=`echo $2 | sed 's/:[[^ ]]*//g'`
- if test "x`(echo '\n') 2>/dev/null`" != 'x\n'; then
-Index: pkg-config-0.23/glib-1.2.10/configure.in
-===================================================================
---- pkg-config-0.23.orig/glib-1.2.10/configure.in 2008-01-16 22:52:24.000000000 +0000
-+++ pkg-config-0.23/glib-1.2.10/configure.in 2008-03-26 20:59:12.000000000 +0000
-@@ -1,10 +1,11 @@
- dnl ***********************************
- dnl *** include special GLib macros ***
- dnl ***********************************
--builtin(include, acglib.m4)dnl
-+dnl no need, just use aclocal -I . --CL
-+dnl builtin(include, acglib.m4)dnl
-
- # require autoconf 2.13
--AC_PREREQ(2.13)
-+AC_PREREQ(2.53)
-
- # init autoconf (and check for presence of glist.c)
- AC_INIT(glist.c)
-@@ -13,11 +14,48 @@
- cflags_set=${CFLAGS+set}
-
- # we rewrite this file
-+if test "x$cross_compiling" != "xyes"; then
- rm -f glibconfig-sysdefs.h
-+fi
-+
-+# config defines
-+
-+AH_TEMPLATE([ENABLE_MEM_CHECK],
-+ [Define if enabling memory checking])
-+AH_TEMPLATE([ENABLE_MEM_PROFILE], [])
-+AH_TEMPLATE([GLIB_BINARY_AGE], [])
-+AH_TEMPLATE([GLIB_BYTE_CONTENTS_GMUTEX], [])
-+AH_TEMPLATE([GLIB_INTERFACE_AGE], [])
-+AH_TEMPLATE([GLIB_MAJOR_VERSION], [])
-+AH_TEMPLATE([GLIB_MINOR_VERSION], [])
-+AH_TEMPLATE([GLIB_MICRO_VERSION], [])
-+AH_TEMPLATE([GLIB_SIZEOF_GMUTEX], [])
-+AH_TEMPLATE([G_COMPILED_WITH_DEBUGGING], [])
-+AH_TEMPLATE([G_HAVE_INLINE], [])
-+AH_TEMPLATE([G_HAVE___INLINE], [])
-+AH_TEMPLATE([G_HAVE___INLINE__], [])
-+AH_TEMPLATE([G_THREAD_SOURCE], [])
-+AH_TEMPLATE([G_VA_COPY], [])
-+AH_TEMPLATE([G_VA_COPY_AS_ARRAY], [])
-+AH_TEMPLATE([HAVE_BROKEN_WCTYPE], [])
-+AH_TEMPLATE([HAVE_GETPWUID_R], [])
-+AH_TEMPLATE([HAVE_GETPWUID_R_POSIX], [])
-+AH_TEMPLATE([HAVE_PTHREAD_COND_TIMEDWAIT_POSIX], [])
-+AH_TEMPLATE([HAVE_PTHREAD_GETSPECIFIC_POSIX], [])
-+AH_TEMPLATE([HAVE_PTHREAD_MUTEX_TRYLOCK_POSIX], [])
-+AH_TEMPLATE([HAVE_WCHAR_H], [])
-+AH_TEMPLATE([HAVE_WCTYPE_H], [])
-+AH_TEMPLATE([NO_FD_SET], [])
-+AH_TEMPLATE([NO_SYS_ERRLIST], [])
-+AH_TEMPLATE([NO_SYS_SIGLIST], [])
-+AH_TEMPLATE([NO_SYS_SIGLIST_DECL], [])
-+AH_TEMPLATE([REALLOC_0_WORKS], [])
-+
-
- dnl we need to AC_DIVERT_PUSH/AC_DIVERT_POP these variable definitions so they
- dnl are available for $ac_help expansion (don't we all *love* autoconf?)
--GLIB_AC_DIVERT_BEFORE_HELP([
-+#AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)
-+#dnl
- #
- # The following version number definitions apply to GLib, GModule and GThread
- # as a whole, so if changes occoured in any of them, they are all
-@@ -38,7 +76,7 @@
- GLIB_BINARY_AGE=10
- GLIB_VERSION=$GLIB_MAJOR_VERSION.$GLIB_MINOR_VERSION.$GLIB_MICRO_VERSION
- dnl
--])
-+#AC_DIVERT_POP()dnl
-
- AC_SUBST(GLIB_MAJOR_VERSION)
- AC_SUBST(GLIB_MINOR_VERSION)
-@@ -72,22 +110,20 @@
- AC_DEFINE_UNQUOTED(GLIB_BINARY_AGE, $GLIB_BINARY_AGE)
-
- dnl Initialize libtool
--AC_PROG_LIBTOOL
-+AM_PROG_LIBTOOL
-
- dnl Initialize maintainer mode
- AM_MAINTAINER_MODE
-
--AC_CANONICAL_HOST
--
- dnl figure debugging default, prior to $ac_help setup
- dnl
--GLIB_AC_DIVERT_BEFORE_HELP([
-+#AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
- if test `expr $GLIB_MINOR_VERSION \% 2` = 1 ; then
- debug_default=yes
- else
- debug_default=minimum
- fi
--]) dnl
-+#AC_DIVERT_POP()dnl
-
- dnl declare --enable-* args and collect ac_help strings
- AC_ARG_ENABLE(debug, [ --enable-debug=[no/minimum/yes] turn on debugging [default=$debug_default]],,enable_debug=$debug_default)
-@@ -194,7 +230,9 @@
- CFLAGS=$glib_save_CFLAGS
- AC_MSG_WARN(
- [No ANSI prototypes found in library. (-std1 didn't work.)])
-+ , AC_MSG_WARN([Skipping test due to crosscompilation])
- )
-+ , AC_MSG_WARN([Skipping test due to crosscompilation])
- )
- LIBS=$glib_save_LIBS
-
-@@ -336,7 +374,7 @@
- if test $gtk_ok = yes; then
- AC_MSG_RESULT([yes, found in sys/types.h])
- else
-- AC_HEADER_EGREP(fd_set, sys/select.h, gtk_ok=yes)
-+ AC_HEADER_EGREP(fd_mask, sys/select.h, gtk_ok=yes)
- if test $gtk_ok = yes; then
- AC_DEFINE(HAVE_SYS_SELECT_H)
- AC_MSG_RESULT([yes, found in sys/select.h])
-@@ -409,7 +447,7 @@
- glib_cv_sane_realloc=no
- ,)
- ])
--if test x$glib_cv_sane_realloc = xyes; then
-+if test "x$glib_cv_sane_realloc" = "xyes"; then
- AC_DEFINE(REALLOC_0_WORKS)
- fi
- AC_MSG_RESULT($glib_cv_sane_realloc)
-@@ -487,7 +525,8 @@
- ])
- if test "x$glib_cv_va_copy" = "xyes"; then
- AC_DEFINE(G_VA_COPY, va_copy)
--else if test "x$glib_cv___va_copy" = "xyes"; then
-+else
-+if test "x$glib_cv___va_copy" = "xyes"; then
- AC_DEFINE(G_VA_COPY, __va_copy)
- fi
- fi
-@@ -496,6 +535,7 @@
- fi
- AC_MSG_RESULT($glib_cv_va_val_copy)
-
-+AC_MSG_WARN([hi mom])
-
- dnl ***********************
- dnl *** g_module checks ***
-@@ -507,23 +547,27 @@
- G_MODULE_BROKEN_RTLD_GLOBAL=0
- G_MODULE_HAVE_DLERROR=0
- dnl *** dlopen() and dlsym() in system libraries
-+AC_CHECK_FUNC(dlopen,[
-+ AC_CHECK_FUNC(dlsym,[
-+ G_MODULE_IMPL=G_MODULE_IMPL_DL
-+ ],
-+ )],
-+)
- if test -z "$G_MODULE_IMPL"; then
-- AC_CHECK_FUNC(dlopen,
-- [AC_CHECK_FUNC(dlsym,
-+ AC_CHECK_FUNC(dlopen,[
-+ AC_CHECK_FUNC(dlsym,[
- G_MODULE_IMPL=G_MODULE_IMPL_DL
-- ,)]
-- ,)
--
-+ ])],
-+ )
- fi
--
- dnl *** dlopen() and dlsym() in libdl
- if test -z "$G_MODULE_IMPL"; then
-- AC_CHECK_LIB(dl, dlopen,
-- [AC_CHECK_LIB(dl, dlsym,
-+ AC_CHECK_LIB(dl, dlopen,[
-+ AC_CHECK_LIB(dl, dlsym,[
- G_MODULE_LIBS=-ldl
- G_MODULE_IMPL=G_MODULE_IMPL_DL
-- ,)]
-- ,)
-+ ])]
-+ )
- fi
- dnl *** shl_load() in libdld (HP-UX)
- if test -z "$G_MODULE_IMPL"; then
-@@ -633,6 +677,7 @@
- AC_SUBST(G_MODULE_NEED_USCORE)
- AC_SUBST(G_MODULE_BROKEN_RTLD_GLOBAL)
- AC_SUBST(GLIB_DEBUG_FLAGS)
-+AC_MSG_WARN([hi mom])
-
-
- dnl ***********************
-@@ -869,40 +914,50 @@
- fi
- if test x"$have_threads" = xposix; then
- LIBS="$LIBS $G_THREAD_LIBS"
-- AC_MSG_CHECKING(whether pthread_getspecific is posix like)
- # PCThreads has pthread_getspecific(pthread_key_t, void **);
-- AC_TRY_COMPILE([#include <pthread.h>],
-- [pthread_getspecific(0,NULL);],
-- [AC_MSG_RESULT(no)],
-- [AC_MSG_RESULT(yes)
-- AC_DEFINE(HAVE_PTHREAD_GETSPECIFIC_POSIX)])
-- AC_MSG_CHECKING(whether pthread_mutex_trylock is posix like)
-+ AC_CACHE_CHECK([whether pthread_getspecific is posix like],
-+ [glib_cv_sys_pthread_getspecific_posix],
-+ AC_TRY_COMPILE([#include <pthread.h>],
-+ [pthread_getspecific(0,NULL);],
-+ [glib_cv_sys_pthread_getspecific_posix=no],
-+ [glib_cv_sys_pthread_getspecific_posix=yes])
-+ )
-+ if test x"$glib_cv_sys_pthread_getspecific_posix" = xyes; then
-+ AC_DEFINE(HAVE_PTHREAD_GETSPECIFIC_POSIX)
-+ fi
- # DCE Threads return 1 as success, posix 0. what a mess.
-- AC_TRY_RUN([#include <pthread.h>
-- pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
-- int main () {
-- return !pthread_mutex_trylock (&mutex); }],
-- [AC_MSG_RESULT(no)],
-- [AC_MSG_RESULT(yes)
-- AC_DEFINE(HAVE_PTHREAD_MUTEX_TRYLOCK_POSIX)])
-- AC_MSG_CHECKING(whether pthread_cond_timedwait is posix like)
-+ AC_CACHE_CHECK([whether pthread_mutex_trylock is posix like],
-+ [glib_cv_sys_pthread_mutex_trylock_posix],
-+ AC_TRY_RUN([#include <pthread.h>
-+ pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
-+ int main () {
-+ return !pthread_mutex_trylock (&mutex); }],
-+ [glib_cv_sys_pthread_mutex_trylock_posix=no],
-+ [glib_cv_sys_pthread_mutex_trylock_posix=yes])
-+ )
-+ if test x"$glib_cv_sys_pthread_mutex_trylock_posix" = xyes; then
-+ AC_DEFINE(HAVE_PTHREAD_MUTEX_TRYLOCK_POSIX)
-+ fi
- # DCE Threads return -1 as failure, posix ETIMEDOUT.
-- AC_TRY_RUN([#include <pthread.h>
-- #include <sys/time.h>
-- int main () {
-- pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
-- pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
-- struct timeval tval;
-- struct timespec tspec;
-- gettimeofday (&tval, NULL);
-- tspec.tv_sec = tval.tv_sec;
-- tspec.tv_nsec = 0;
-- pthread_mutex_lock (&mutex);
-- return pthread_cond_timedwait (&cond,&mutex,&tspec)
-- != -1;}],
-- [AC_MSG_RESULT(no)],
-- [AC_MSG_RESULT(yes)
-- AC_DEFINE(HAVE_PTHREAD_COND_TIMEDWAIT_POSIX)])
-+ AC_CACHE_CHECK([whether pthread_cond_timedwait is posix like],
-+ [glib_cv_sys_pthread_cond_timedwait_posix],
-+ AC_TRY_RUN([#include <pthread.h>
-+ int main () {
-+ pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
-+ pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
-+ struct timeval tval;
-+ struct timespec tspec;
-+ gettimeofday (&tval, NULL);
-+ tspec.tv_sec = tval.tv_sec;
-+ tspec.tv_nsec = 0;
-+ return pthread_cond_timedwait (&cond,&mutex,&tspec)
-+ != -1;}],
-+ [glib_cv_sys_pthread_cond_timedwait_posix=no],
-+ [glib_cv_sys_pthread_cond_timedwait_posix=yes])
-+ )
-+ if test x"$glib_cv_sys_pthread_cond_timedwait_posix" = xyes; then
-+ AC_DEFINE(HAVE_PTHREAD_COND_TIMEDWAIT_POSIX)
-+ fi
- fi
- LIBS="$glib_save_LIBS"
- CFLAGS="$glib_save_CFLAGS"
-@@ -946,13 +1001,14 @@
- dnl ****************************************
- dnl *** GLib POLL* compatibility defines ***
- dnl ****************************************
-+if test x"$cross_compiling" != xyes; then
- GLIB_SYSDEFS(
- [#include <sys/types.h>
- #include <sys/poll.h>],
- POLLIN:1 POLLOUT:4 POLLPRI:2 POLLERR:8 POLLHUP:16 POLLNVAL:32,
- glibconfig-sysdefs.h,
- =)
--
-+fi
-
- dnl ******************************
- dnl *** output the whole stuff ***
-@@ -1005,7 +1061,7 @@
- echo '#define GLIB_HAVE_SYS_POLL_H' >> $outfile
- fi
-
-- cat >> $outfile <<_______EOF
-+ cat >> $outfile <<EOF
-
- #ifdef __cplusplus
- extern "C" {
-@@ -1022,60 +1078,60 @@
- #define G_MINLONG $glib_ml
- #define G_MAXLONG $glib_Ml
-
--_______EOF
-+EOF
-
-
- ### this should always be true in a modern C/C++ compiler
-- cat >>$outfile <<_______EOF
-+ cat >>$outfile <<EOF
- typedef signed char gint8;
- typedef unsigned char guint8;
--_______EOF
-+EOF
-
-
- if test -n "$gint16"; then
-- cat >>$outfile <<_______EOF
-+ cat >>$outfile <<EOF
- typedef signed $gint16 gint16;
- typedef unsigned $gint16 guint16;
--_______EOF
-+EOF
- fi
-
-
- if test -n "$gint32"; then
-- cat >>$outfile <<_______EOF
-+ cat >>$outfile <<EOF
- typedef signed $gint32 gint32;
- typedef unsigned $gint32 guint32;
--_______EOF
-+EOF
- fi
-
-
- if test -n "$gint64"; then
-- cat >>$outfile <<_______EOF
-+ cat >>$outfile <<EOF
- ${glib_warning_guard}#define G_HAVE_GINT64 1
-
- ${glib_extension}typedef signed $gint64 gint64;
- ${glib_extension}typedef unsigned $gint64 guint64;
-
- #define G_GINT64_CONSTANT(val) $gint64_constant
--_______EOF
-+EOF
- fi
-
-
- if test -z "$glib_unknown_void_p"; then
-- cat >>$outfile <<_______EOF
-+ cat >>$outfile <<EOF
-
- #define GPOINTER_TO_INT(p) ((gint) ${glib_gpi_cast} (p))
- #define GPOINTER_TO_UINT(p) ((guint) ${glib_gpui_cast} (p))
-
- #define GINT_TO_POINTER(i) ((gpointer) ${glib_gpi_cast} (i))
- #define GUINT_TO_POINTER(u) ((gpointer) ${glib_gpui_cast} (u))
--_______EOF
-+EOF
- else
- echo '#error SIZEOF_VOID_P unknown - This should never happen' >>$outfile
- fi
-
-
-
-- cat >>$outfile <<_______EOF
-+ cat >>$outfile <<EOF
- $glib_atexit
- $glib_memmove
- $glib_defines
-@@ -1087,11 +1143,11 @@
- #else /* !__cplusplus */
- $glib_inline
- #endif /* !__cplusplus */
--_______EOF
-+EOF
-
- echo >>$outfile
- if test x$g_mutex_has_default = xyes; then
-- cat >>$outfile <<_______EOF
-+ cat >>$outfile <<EOF
- $g_enable_threads_def G_THREADS_ENABLED
- #define G_THREADS_IMPL_$g_threads_impl_def
- typedef struct _GStaticMutex GStaticMutex;
-@@ -1109,15 +1165,15 @@
- #define g_static_mutex_get_mutex(mutex) \
- (g_thread_use_default_impl ? ((GMutex*) &((mutex)->aligned_pad_u)) : \
- g_static_mutex_get_mutex_impl (&((mutex)->runtime_mutex)))
--_______EOF
-+EOF
- else
-- cat >>$outfile <<_______EOF
-+ cat >>$outfile <<EOF
- $g_enable_threads_def G_THREADS_ENABLED
- #define G_THREADS_IMPL_$g_threads_impl_def
- typedef struct _GMutex* GStaticMutex;
- #define G_STATIC_MUTEX_INIT NULL
- #define g_static_mutex_get_mutex(mutex) (g_static_mutex_get_mutex_impl (mutex))
--_______EOF
-+EOF
- fi
-
- echo >>$outfile
-@@ -1126,15 +1182,15 @@
- g_bit_sizes="$g_bit_sizes 64"
- fi
- for bits in $g_bit_sizes; do
-- cat >>$outfile <<_______EOF
-+ cat >>$outfile <<EOF
- #define GINT${bits}_TO_${g_bs_native}(val) ((gint${bits}) (val))
- #define GUINT${bits}_TO_${g_bs_native}(val) ((guint${bits}) (val))
- #define GINT${bits}_TO_${g_bs_alien}(val) ((gint${bits}) GUINT${bits}_SWAP_LE_BE (val))
- #define GUINT${bits}_TO_${g_bs_alien}(val) (GUINT${bits}_SWAP_LE_BE (val))
--_______EOF
-+EOF
- done
-
-- cat >>$outfile <<_______EOF
-+ cat >>$outfile <<EOF
- #define GLONG_TO_LE(val) ((glong) GINT${glongbits}_TO_LE (val))
- #define GULONG_TO_LE(val) ((gulong) GUINT${glongbits}_TO_LE (val))
- #define GLONG_TO_BE(val) ((glong) GINT${glongbits}_TO_BE (val))
-@@ -1145,14 +1201,14 @@
- #define GUINT_TO_BE(val) ((guint) GUINT${gintbits}_TO_BE (val))
- #define G_BYTE_ORDER $g_byte_order
-
--_______EOF
-+EOF
-
- if test -r glibconfig-sysdefs.h; then
- cat glibconfig-sysdefs.h >>$outfile
- fi
-
-
-- cat >>$outfile <<_______EOF
-+ cat >>$outfile <<EOF
-
- $glib_wc
-
-@@ -1162,7 +1218,7 @@
- #endif /* __cplusplus */
-
- #endif /* GLIBCONFIG_H */
--_______EOF
-+EOF
-
-
- if cmp -s $outfile glibconfig.h; then
-Index: pkg-config-0.23/glib-1.2.10/glib.m4
-===================================================================
---- pkg-config-0.23.orig/glib-1.2.10/glib.m4 2008-04-14 23:34:39.000000000 +0100
-+++ pkg-config-0.23/glib-1.2.10/glib.m4 2008-04-14 09:26:29.000000000 +0100
-@@ -5,7 +5,7 @@
- dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or
- dnl gthread is specified in MODULES, pass to glib-config
- dnl
--AC_DEFUN(AM_PATH_GLIB,
-+AC_DEFUN([AM_PATH_GLIB],
- [dnl
- dnl Get the cflags and libraries from the glib-config script
- dnl
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig-0.28/obsolete_automake_macros.patch b/meta/recipes-devtools/pkgconfig/pkgconfig-0.28/obsolete_automake_macros.patch
deleted file mode 100644
index 7d93b1c..0000000
--- a/meta/recipes-devtools/pkgconfig/pkgconfig-0.28/obsolete_automake_macros.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Remove obsolete AM_PROG_CC_STDC use as there's already modern equivalent,
-AC_PROG_CC, present.
-
-Upstream-Status: Submitted
-
-Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
-diff -Nurd pkg-config-0.28/glib/configure.ac pkg-config-0.28/glib/configure.ac
---- pkg-config-0.28/glib/configure.ac 2012-10-13 17:35:36.000000000 +0300
-+++ pkg-config-0.28/glib/configure.ac 2013-05-24 23:48:34.093415116 +0300
-@@ -288,7 +288,6 @@
- AM_CONDITIONAL(HAVE_CXX, [test "$CXX" != ""])
- AC_LANG_RESTORE
-
--AM_PROG_CC_STDC
- AM_PROG_CC_C_O
- AC_PROG_INSTALL
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig.inc b/meta/recipes-devtools/pkgconfig/pkgconfig.inc
index c4ada80..55ab5c4 100644
--- a/meta/recipes-devtools/pkgconfig/pkgconfig.inc
+++ b/meta/recipes-devtools/pkgconfig/pkgconfig.inc
@@ -12,9 +12,11 @@ DEPENDS = "glib-2.0"
DEPENDS_class-native = ""
DEPENDS_class-nativesdk = ""
-SRC_URI = "http://pkgconfig.freedesktop.org/releases/pkg-config-${PV}.tar.gz"
+SRCREV = "40342dd0ead05d457a2a4e692cf865f50033a709"
+PV = "0.28+git${SRCPV}"
+SRC_URI = "git://anongit.freedesktop.org/pkg-config"
-S = "${WORKDIR}/pkg-config-${PV}/"
+S = "${WORKDIR}/git"
inherit autotools
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig/autofoo.patch b/meta/recipes-devtools/pkgconfig/pkgconfig/autofoo.patch
deleted file mode 100644
index 9853577..0000000
--- a/meta/recipes-devtools/pkgconfig/pkgconfig/autofoo.patch
+++ /dev/null
@@ -1,528 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
----
- glib-1.2.10/acglib.m4 | 12 +-
- glib-1.2.10/configure.in | 212 ++++++++++++++++++++++++++++++------------------
- 2 files changed, 140 insertions(+), 84 deletions(-)
-
-Index: pkg-config-0.23/glib-1.2.10/acglib.m4
-===================================================================
---- pkg-config-0.23.orig/glib-1.2.10/acglib.m4 2008-01-16 22:52:24.000000000 +0000
-+++ pkg-config-0.23/glib-1.2.10/acglib.m4 2008-03-26 20:59:12.000000000 +0000
-@@ -10,7 +10,7 @@
- AC_DIVERT_POP()])])])
-
- dnl GLIB_IF_VAR_EQ (ENV_VAR, VALUE [, EQUALS_ACTION] [, ELSE_ACTION])
--AC_DEFUN(GLIB_IF_VAR_EQ,[
-+AC_DEFUN([GLIB_IF_VAR_EQ],[
- case "$[$1]" in
- "[$2]"[)]
- [$3]
-@@ -21,7 +21,7 @@
- esac
- ])
- dnl GLIB_STR_CONTAINS (SRC_STRING, SUB_STRING [, CONTAINS_ACTION] [, ELSE_ACTION])
--AC_DEFUN(GLIB_STR_CONTAINS,[
-+AC_DEFUN([GLIB_STR_CONTAINS],[
- case "[$1]" in
- *"[$2]"*[)]
- [$3]
-@@ -32,12 +32,12 @@
- esac
- ])
- dnl GLIB_ADD_TO_VAR (ENV_VARIABLE, CHECK_STRING, ADD_STRING)
--AC_DEFUN(GLIB_ADD_TO_VAR,[
-+AC_DEFUN([GLIB_ADD_TO_VAR],[
- GLIB_STR_CONTAINS($[$1], [$2], [$1]="$[$1]", [$1]="$[$1] [$3]")
- ])
-
- dnl GLIB_SIZEOF (INCLUDES, TYPE, ALIAS [, CROSS-SIZE])
--AC_DEFUN(GLIB_SIZEOF,
-+AC_DEFUN([GLIB_SIZEOF],
- [changequote(<<, >>)dnl
- dnl The name to #define.
- define(<<AC_TYPE_NAME>>, translit(glib_sizeof_$3, [a-z *], [A-Z_P]))dnl
-@@ -62,7 +62,7 @@
- ])
-
- dnl GLIB_BYTE_CONTENTS (INCLUDES, TYPE, ALIAS, N_BYTES, INITIALIZER)
--AC_DEFUN(GLIB_BYTE_CONTENTS,
-+AC_DEFUN([GLIB_BYTE_CONTENTS],
- [changequote(<<, >>)dnl
- dnl The name to #define.
- define(<<AC_TYPE_NAME>>, translit(glib_byte_contents_$3, [a-z *], [A-Z_P]))dnl
-@@ -92,7 +92,7 @@
- ])
-
- dnl GLIB_SYSDEFS (INCLUDES, DEFS_LIST, OFILE [, PREFIX])
--AC_DEFUN(GLIB_SYSDEFS,
-+AC_DEFUN([GLIB_SYSDEFS],
- [glib_sysdefso="translit($3, [-_a-zA-Z0-9 *], [-_a-zA-Z0-9])"
- glib_sysdef_msg=`echo $2 | sed 's/:[[^ ]]*//g'`
- if test "x`(echo '\n') 2>/dev/null`" != 'x\n'; then
-Index: pkg-config-0.23/glib-1.2.10/configure.in
-===================================================================
---- pkg-config-0.23.orig/glib-1.2.10/configure.in 2008-01-16 22:52:24.000000000 +0000
-+++ pkg-config-0.23/glib-1.2.10/configure.in 2008-03-26 20:59:12.000000000 +0000
-@@ -1,10 +1,11 @@
- dnl ***********************************
- dnl *** include special GLib macros ***
- dnl ***********************************
--builtin(include, acglib.m4)dnl
-+dnl no need, just use aclocal -I . --CL
-+dnl builtin(include, acglib.m4)dnl
-
- # require autoconf 2.13
--AC_PREREQ(2.13)
-+AC_PREREQ(2.53)
-
- # init autoconf (and check for presence of glist.c)
- AC_INIT(glist.c)
-@@ -13,11 +14,48 @@
- cflags_set=${CFLAGS+set}
-
- # we rewrite this file
-+if test "x$cross_compiling" != "xyes"; then
- rm -f glibconfig-sysdefs.h
-+fi
-+
-+# config defines
-+
-+AH_TEMPLATE([ENABLE_MEM_CHECK],
-+ [Define if enabling memory checking])
-+AH_TEMPLATE([ENABLE_MEM_PROFILE], [])
-+AH_TEMPLATE([GLIB_BINARY_AGE], [])
-+AH_TEMPLATE([GLIB_BYTE_CONTENTS_GMUTEX], [])
-+AH_TEMPLATE([GLIB_INTERFACE_AGE], [])
-+AH_TEMPLATE([GLIB_MAJOR_VERSION], [])
-+AH_TEMPLATE([GLIB_MINOR_VERSION], [])
-+AH_TEMPLATE([GLIB_MICRO_VERSION], [])
-+AH_TEMPLATE([GLIB_SIZEOF_GMUTEX], [])
-+AH_TEMPLATE([G_COMPILED_WITH_DEBUGGING], [])
-+AH_TEMPLATE([G_HAVE_INLINE], [])
-+AH_TEMPLATE([G_HAVE___INLINE], [])
-+AH_TEMPLATE([G_HAVE___INLINE__], [])
-+AH_TEMPLATE([G_THREAD_SOURCE], [])
-+AH_TEMPLATE([G_VA_COPY], [])
-+AH_TEMPLATE([G_VA_COPY_AS_ARRAY], [])
-+AH_TEMPLATE([HAVE_BROKEN_WCTYPE], [])
-+AH_TEMPLATE([HAVE_GETPWUID_R], [])
-+AH_TEMPLATE([HAVE_GETPWUID_R_POSIX], [])
-+AH_TEMPLATE([HAVE_PTHREAD_COND_TIMEDWAIT_POSIX], [])
-+AH_TEMPLATE([HAVE_PTHREAD_GETSPECIFIC_POSIX], [])
-+AH_TEMPLATE([HAVE_PTHREAD_MUTEX_TRYLOCK_POSIX], [])
-+AH_TEMPLATE([HAVE_WCHAR_H], [])
-+AH_TEMPLATE([HAVE_WCTYPE_H], [])
-+AH_TEMPLATE([NO_FD_SET], [])
-+AH_TEMPLATE([NO_SYS_ERRLIST], [])
-+AH_TEMPLATE([NO_SYS_SIGLIST], [])
-+AH_TEMPLATE([NO_SYS_SIGLIST_DECL], [])
-+AH_TEMPLATE([REALLOC_0_WORKS], [])
-+
-
- dnl we need to AC_DIVERT_PUSH/AC_DIVERT_POP these variable definitions so they
- dnl are available for $ac_help expansion (don't we all *love* autoconf?)
--GLIB_AC_DIVERT_BEFORE_HELP([
-+#AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)
-+#dnl
- #
- # The following version number definitions apply to GLib, GModule and GThread
- # as a whole, so if changes occoured in any of them, they are all
-@@ -38,7 +76,7 @@
- GLIB_BINARY_AGE=10
- GLIB_VERSION=$GLIB_MAJOR_VERSION.$GLIB_MINOR_VERSION.$GLIB_MICRO_VERSION
- dnl
--])
-+#AC_DIVERT_POP()dnl
-
- AC_SUBST(GLIB_MAJOR_VERSION)
- AC_SUBST(GLIB_MINOR_VERSION)
-@@ -72,22 +110,20 @@
- AC_DEFINE_UNQUOTED(GLIB_BINARY_AGE, $GLIB_BINARY_AGE)
-
- dnl Initialize libtool
--AC_PROG_LIBTOOL
-+AM_PROG_LIBTOOL
-
- dnl Initialize maintainer mode
- AM_MAINTAINER_MODE
-
--AC_CANONICAL_HOST
--
- dnl figure debugging default, prior to $ac_help setup
- dnl
--GLIB_AC_DIVERT_BEFORE_HELP([
-+#AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
- if test `expr $GLIB_MINOR_VERSION \% 2` = 1 ; then
- debug_default=yes
- else
- debug_default=minimum
- fi
--]) dnl
-+#AC_DIVERT_POP()dnl
-
- dnl declare --enable-* args and collect ac_help strings
- AC_ARG_ENABLE(debug, [ --enable-debug=[no/minimum/yes] turn on debugging [default=$debug_default]],,enable_debug=$debug_default)
-@@ -194,7 +230,9 @@
- CFLAGS=$glib_save_CFLAGS
- AC_MSG_WARN(
- [No ANSI prototypes found in library. (-std1 didn't work.)])
-+ , AC_MSG_WARN([Skipping test due to crosscompilation])
- )
-+ , AC_MSG_WARN([Skipping test due to crosscompilation])
- )
- LIBS=$glib_save_LIBS
-
-@@ -336,7 +374,7 @@
- if test $gtk_ok = yes; then
- AC_MSG_RESULT([yes, found in sys/types.h])
- else
-- AC_HEADER_EGREP(fd_set, sys/select.h, gtk_ok=yes)
-+ AC_HEADER_EGREP(fd_mask, sys/select.h, gtk_ok=yes)
- if test $gtk_ok = yes; then
- AC_DEFINE(HAVE_SYS_SELECT_H)
- AC_MSG_RESULT([yes, found in sys/select.h])
-@@ -409,7 +447,7 @@
- glib_cv_sane_realloc=no
- ,)
- ])
--if test x$glib_cv_sane_realloc = xyes; then
-+if test "x$glib_cv_sane_realloc" = "xyes"; then
- AC_DEFINE(REALLOC_0_WORKS)
- fi
- AC_MSG_RESULT($glib_cv_sane_realloc)
-@@ -487,7 +525,8 @@
- ])
- if test "x$glib_cv_va_copy" = "xyes"; then
- AC_DEFINE(G_VA_COPY, va_copy)
--else if test "x$glib_cv___va_copy" = "xyes"; then
-+else
-+if test "x$glib_cv___va_copy" = "xyes"; then
- AC_DEFINE(G_VA_COPY, __va_copy)
- fi
- fi
-@@ -496,6 +535,7 @@
- fi
- AC_MSG_RESULT($glib_cv_va_val_copy)
-
-+AC_MSG_WARN([hi mom])
-
- dnl ***********************
- dnl *** g_module checks ***
-@@ -507,23 +547,27 @@
- G_MODULE_BROKEN_RTLD_GLOBAL=0
- G_MODULE_HAVE_DLERROR=0
- dnl *** dlopen() and dlsym() in system libraries
-+AC_CHECK_FUNC(dlopen,[
-+ AC_CHECK_FUNC(dlsym,[
-+ G_MODULE_IMPL=G_MODULE_IMPL_DL
-+ ],
-+ )],
-+)
- if test -z "$G_MODULE_IMPL"; then
-- AC_CHECK_FUNC(dlopen,
-- [AC_CHECK_FUNC(dlsym,
-+ AC_CHECK_FUNC(dlopen,[
-+ AC_CHECK_FUNC(dlsym,[
- G_MODULE_IMPL=G_MODULE_IMPL_DL
-- ,)]
-- ,)
--
-+ ])],
-+ )
- fi
--
- dnl *** dlopen() and dlsym() in libdl
- if test -z "$G_MODULE_IMPL"; then
-- AC_CHECK_LIB(dl, dlopen,
-- [AC_CHECK_LIB(dl, dlsym,
-+ AC_CHECK_LIB(dl, dlopen,[
-+ AC_CHECK_LIB(dl, dlsym,[
- G_MODULE_LIBS=-ldl
- G_MODULE_IMPL=G_MODULE_IMPL_DL
-- ,)]
-- ,)
-+ ])]
-+ )
- fi
- dnl *** shl_load() in libdld (HP-UX)
- if test -z "$G_MODULE_IMPL"; then
-@@ -633,6 +677,7 @@
- AC_SUBST(G_MODULE_NEED_USCORE)
- AC_SUBST(G_MODULE_BROKEN_RTLD_GLOBAL)
- AC_SUBST(GLIB_DEBUG_FLAGS)
-+AC_MSG_WARN([hi mom])
-
-
- dnl ***********************
-@@ -869,40 +914,50 @@
- fi
- if test x"$have_threads" = xposix; then
- LIBS="$LIBS $G_THREAD_LIBS"
-- AC_MSG_CHECKING(whether pthread_getspecific is posix like)
- # PCThreads has pthread_getspecific(pthread_key_t, void **);
-- AC_TRY_COMPILE([#include <pthread.h>],
-- [pthread_getspecific(0,NULL);],
-- [AC_MSG_RESULT(no)],
-- [AC_MSG_RESULT(yes)
-- AC_DEFINE(HAVE_PTHREAD_GETSPECIFIC_POSIX)])
-- AC_MSG_CHECKING(whether pthread_mutex_trylock is posix like)
-+ AC_CACHE_CHECK([whether pthread_getspecific is posix like],
-+ [glib_cv_sys_pthread_getspecific_posix],
-+ AC_TRY_COMPILE([#include <pthread.h>],
-+ [pthread_getspecific(0,NULL);],
-+ [glib_cv_sys_pthread_getspecific_posix=no],
-+ [glib_cv_sys_pthread_getspecific_posix=yes])
-+ )
-+ if test x"$glib_cv_sys_pthread_getspecific_posix" = xyes; then
-+ AC_DEFINE(HAVE_PTHREAD_GETSPECIFIC_POSIX)
-+ fi
- # DCE Threads return 1 as success, posix 0. what a mess.
-- AC_TRY_RUN([#include <pthread.h>
-- pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
-- int main () {
-- return !pthread_mutex_trylock (&mutex); }],
-- [AC_MSG_RESULT(no)],
-- [AC_MSG_RESULT(yes)
-- AC_DEFINE(HAVE_PTHREAD_MUTEX_TRYLOCK_POSIX)])
-- AC_MSG_CHECKING(whether pthread_cond_timedwait is posix like)
-+ AC_CACHE_CHECK([whether pthread_mutex_trylock is posix like],
-+ [glib_cv_sys_pthread_mutex_trylock_posix],
-+ AC_TRY_RUN([#include <pthread.h>
-+ pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
-+ int main () {
-+ return !pthread_mutex_trylock (&mutex); }],
-+ [glib_cv_sys_pthread_mutex_trylock_posix=no],
-+ [glib_cv_sys_pthread_mutex_trylock_posix=yes])
-+ )
-+ if test x"$glib_cv_sys_pthread_mutex_trylock_posix" = xyes; then
-+ AC_DEFINE(HAVE_PTHREAD_MUTEX_TRYLOCK_POSIX)
-+ fi
- # DCE Threads return -1 as failure, posix ETIMEDOUT.
-- AC_TRY_RUN([#include <pthread.h>
-- #include <sys/time.h>
-- int main () {
-- pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
-- pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
-- struct timeval tval;
-- struct timespec tspec;
-- gettimeofday (&tval, NULL);
-- tspec.tv_sec = tval.tv_sec;
-- tspec.tv_nsec = 0;
-- pthread_mutex_lock (&mutex);
-- return pthread_cond_timedwait (&cond,&mutex,&tspec)
-- != -1;}],
-- [AC_MSG_RESULT(no)],
-- [AC_MSG_RESULT(yes)
-- AC_DEFINE(HAVE_PTHREAD_COND_TIMEDWAIT_POSIX)])
-+ AC_CACHE_CHECK([whether pthread_cond_timedwait is posix like],
-+ [glib_cv_sys_pthread_cond_timedwait_posix],
-+ AC_TRY_RUN([#include <pthread.h>
-+ int main () {
-+ pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
-+ pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
-+ struct timeval tval;
-+ struct timespec tspec;
-+ gettimeofday (&tval, NULL);
-+ tspec.tv_sec = tval.tv_sec;
-+ tspec.tv_nsec = 0;
-+ return pthread_cond_timedwait (&cond,&mutex,&tspec)
-+ != -1;}],
-+ [glib_cv_sys_pthread_cond_timedwait_posix=no],
-+ [glib_cv_sys_pthread_cond_timedwait_posix=yes])
-+ )
-+ if test x"$glib_cv_sys_pthread_cond_timedwait_posix" = xyes; then
-+ AC_DEFINE(HAVE_PTHREAD_COND_TIMEDWAIT_POSIX)
-+ fi
- fi
- LIBS="$glib_save_LIBS"
- CFLAGS="$glib_save_CFLAGS"
-@@ -946,13 +1001,14 @@
- dnl ****************************************
- dnl *** GLib POLL* compatibility defines ***
- dnl ****************************************
-+if test x"$cross_compiling" != xyes; then
- GLIB_SYSDEFS(
- [#include <sys/types.h>
- #include <sys/poll.h>],
- POLLIN:1 POLLOUT:4 POLLPRI:2 POLLERR:8 POLLHUP:16 POLLNVAL:32,
- glibconfig-sysdefs.h,
- =)
--
-+fi
-
- dnl ******************************
- dnl *** output the whole stuff ***
-@@ -1005,7 +1061,7 @@
- echo '#define GLIB_HAVE_SYS_POLL_H' >> $outfile
- fi
-
-- cat >> $outfile <<_______EOF
-+ cat >> $outfile <<EOF
-
- #ifdef __cplusplus
- extern "C" {
-@@ -1022,60 +1078,60 @@
- #define G_MINLONG $glib_ml
- #define G_MAXLONG $glib_Ml
-
--_______EOF
-+EOF
-
-
- ### this should always be true in a modern C/C++ compiler
-- cat >>$outfile <<_______EOF
-+ cat >>$outfile <<EOF
- typedef signed char gint8;
- typedef unsigned char guint8;
--_______EOF
-+EOF
-
-
- if test -n "$gint16"; then
-- cat >>$outfile <<_______EOF
-+ cat >>$outfile <<EOF
- typedef signed $gint16 gint16;
- typedef unsigned $gint16 guint16;
--_______EOF
-+EOF
- fi
-
-
- if test -n "$gint32"; then
-- cat >>$outfile <<_______EOF
-+ cat >>$outfile <<EOF
- typedef signed $gint32 gint32;
- typedef unsigned $gint32 guint32;
--_______EOF
-+EOF
- fi
-
-
- if test -n "$gint64"; then
-- cat >>$outfile <<_______EOF
-+ cat >>$outfile <<EOF
- ${glib_warning_guard}#define G_HAVE_GINT64 1
-
- ${glib_extension}typedef signed $gint64 gint64;
- ${glib_extension}typedef unsigned $gint64 guint64;
-
- #define G_GINT64_CONSTANT(val) $gint64_constant
--_______EOF
-+EOF
- fi
-
-
- if test -z "$glib_unknown_void_p"; then
-- cat >>$outfile <<_______EOF
-+ cat >>$outfile <<EOF
-
- #define GPOINTER_TO_INT(p) ((gint) ${glib_gpi_cast} (p))
- #define GPOINTER_TO_UINT(p) ((guint) ${glib_gpui_cast} (p))
-
- #define GINT_TO_POINTER(i) ((gpointer) ${glib_gpi_cast} (i))
- #define GUINT_TO_POINTER(u) ((gpointer) ${glib_gpui_cast} (u))
--_______EOF
-+EOF
- else
- echo '#error SIZEOF_VOID_P unknown - This should never happen' >>$outfile
- fi
-
-
-
-- cat >>$outfile <<_______EOF
-+ cat >>$outfile <<EOF
- $glib_atexit
- $glib_memmove
- $glib_defines
-@@ -1087,11 +1143,11 @@
- #else /* !__cplusplus */
- $glib_inline
- #endif /* !__cplusplus */
--_______EOF
-+EOF
-
- echo >>$outfile
- if test x$g_mutex_has_default = xyes; then
-- cat >>$outfile <<_______EOF
-+ cat >>$outfile <<EOF
- $g_enable_threads_def G_THREADS_ENABLED
- #define G_THREADS_IMPL_$g_threads_impl_def
- typedef struct _GStaticMutex GStaticMutex;
-@@ -1109,15 +1165,15 @@
- #define g_static_mutex_get_mutex(mutex) \
- (g_thread_use_default_impl ? ((GMutex*) &((mutex)->aligned_pad_u)) : \
- g_static_mutex_get_mutex_impl (&((mutex)->runtime_mutex)))
--_______EOF
-+EOF
- else
-- cat >>$outfile <<_______EOF
-+ cat >>$outfile <<EOF
- $g_enable_threads_def G_THREADS_ENABLED
- #define G_THREADS_IMPL_$g_threads_impl_def
- typedef struct _GMutex* GStaticMutex;
- #define G_STATIC_MUTEX_INIT NULL
- #define g_static_mutex_get_mutex(mutex) (g_static_mutex_get_mutex_impl (mutex))
--_______EOF
-+EOF
- fi
-
- echo >>$outfile
-@@ -1126,15 +1182,15 @@
- g_bit_sizes="$g_bit_sizes 64"
- fi
- for bits in $g_bit_sizes; do
-- cat >>$outfile <<_______EOF
-+ cat >>$outfile <<EOF
- #define GINT${bits}_TO_${g_bs_native}(val) ((gint${bits}) (val))
- #define GUINT${bits}_TO_${g_bs_native}(val) ((guint${bits}) (val))
- #define GINT${bits}_TO_${g_bs_alien}(val) ((gint${bits}) GUINT${bits}_SWAP_LE_BE (val))
- #define GUINT${bits}_TO_${g_bs_alien}(val) (GUINT${bits}_SWAP_LE_BE (val))
--_______EOF
-+EOF
- done
-
-- cat >>$outfile <<_______EOF
-+ cat >>$outfile <<EOF
- #define GLONG_TO_LE(val) ((glong) GINT${glongbits}_TO_LE (val))
- #define GULONG_TO_LE(val) ((gulong) GUINT${glongbits}_TO_LE (val))
- #define GLONG_TO_BE(val) ((glong) GINT${glongbits}_TO_BE (val))
-@@ -1145,14 +1201,14 @@
- #define GUINT_TO_BE(val) ((guint) GUINT${gintbits}_TO_BE (val))
- #define G_BYTE_ORDER $g_byte_order
-
--_______EOF
-+EOF
-
- if test -r glibconfig-sysdefs.h; then
- cat glibconfig-sysdefs.h >>$outfile
- fi
-
-
-- cat >>$outfile <<_______EOF
-+ cat >>$outfile <<EOF
-
- $glib_wc
-
-@@ -1162,7 +1218,7 @@
- #endif /* __cplusplus */
-
- #endif /* GLIBCONFIG_H */
--_______EOF
-+EOF
-
-
- if cmp -s $outfile glibconfig.h; then
-Index: pkg-config-0.23/glib-1.2.10/glib.m4
-===================================================================
---- pkg-config-0.23.orig/glib-1.2.10/glib.m4 2008-04-14 23:34:39.000000000 +0100
-+++ pkg-config-0.23/glib-1.2.10/glib.m4 2008-04-14 09:26:29.000000000 +0100
-@@ -5,7 +5,7 @@
- dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or
- dnl gthread is specified in MODULES, pass to glib-config
- dnl
--AC_DEFUN(AM_PATH_GLIB,
-+AC_DEFUN([AM_PATH_GLIB],
- [dnl
- dnl Get the cflags and libraries from the glib-config script
- dnl
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig-0.28/fix-glib-configure-libtool-usage.patch b/meta/recipes-devtools/pkgconfig/pkgconfig/fix-glib-configure-libtool-usage.patch
similarity index 100%
rename from meta/recipes-devtools/pkgconfig/pkgconfig-0.28/fix-glib-configure-libtool-usage.patch
rename to meta/recipes-devtools/pkgconfig/pkgconfig/fix-glib-configure-libtool-usage.patch
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig_0.28.bb b/meta/recipes-devtools/pkgconfig/pkgconfig_0.28.bb
deleted file mode 100644
index 57a22d4..0000000
--- a/meta/recipes-devtools/pkgconfig/pkgconfig_0.28.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require pkgconfig.inc
-
-SRC_URI += " \
- file://pkg-config-native.in \
- file://fix-glib-configure-libtool-usage.patch \
- file://obsolete_automake_macros.patch \
- file://0001-Strip-system-library-directories-reliably.patch \
- "
-
-SRC_URI[md5sum] = "aa3c86e67551adc3ac865160e34a2a0d"
-SRC_URI[sha256sum] = "6b6eb31c6ec4421174578652c7e141fdaae2dabad1021f420d8713206ac1f845"
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb b/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb
index e420420..eaa511a 100644
--- a/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb
+++ b/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb
@@ -1,40 +1,6 @@
require pkgconfig.inc
-SRC_URI = "git://anongit.freedesktop.org/pkg-config \
- file://autofoo.patch"
-
-S = "${WORKDIR}/git/"
-
-SRCREV = "66d49f1375fec838bcd301bb4ca2ef76cee0e47c"
-PV = "0.23+git${SRCPV}"
-PR = "r1"
-
-DEFAULT_PREFERENCE = "-1"
-
-# Can't do native version with git since git-native depends on pkgconfig-native
-BBCLASSEXTEND = "nativesdk"
-
-do_fixsource() {
- # Adapted from autogen.sh
- cd ${S}
- tar -xvzf glib-1.2.10.tar.gz
-
- chmod +w `find glib-1.2.10 -name Makefile.am`
- perl -p -i.bak -e "s/lib_LTLIBRARIES/noinst_LTLIBRARIES/g" `find glib-1.2.10 -name Makefile.am`
- perl -p -i.bak -e "s/bin_SCRIPTS/noinst_SCRIPTS/g" `find glib-1.2.10 -name Makefile.am`
- perl -p -i.bak -e "s/include_HEADERS/noinst_HEADERS/g" `find glib-1.2.10 -name Makefile.am`
- perl -p -i.bak -e "s/glibnoinst_HEADERS/noinst_HEADERS/g" `find glib-1.2.10 -name Makefile.am`
- perl -p -i.bak -e 's/([a-zA-Z0-9]+)_DATA/noinst_DATA/g' `find glib-1.2.10 -name Makefile.am`
- perl -p -i.bak -e "s/info_TEXINFOS/noinst_TEXINFOS/g" `find glib-1.2.10 -name Makefile.am`
- perl -p -i.bak -e "s/man_MANS/noinst_MANS/g" `find glib-1.2.10 -name Makefile.am`
-
- ## patch gslist.c to have stable sort
- perl -p -w -i.bak -e 's/if \(compare_func\(l1->data,l2->data\) < 0\)/if \(compare_func\(l1->data,l2->data\) <= 0\)/g' glib-1.2.10/gslist.c
-
- # Update random auto* files to actually have something which have a snowball's
- # chance in a hot place of working with modern auto* tools.
-
- (cd glib-1.2.10 && for p in ../glib-patches/*.diff; do echo $p; patch -p1 < $p || exit 1; done ) || exit 1
-}
-
-addtask fixsource before do_patch after do_unpack
+SRC_URI += " \
+ file://pkg-config-native.in \
+ file://fix-glib-configure-libtool-usage.patch \
+ "
--
2.1.4
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH 13/14] fontconfig: Upgrade to 2.11.93
2015-04-24 3:35 [PATCH 00/14] Fix world build with gcc-5 Khem Raj
` (11 preceding siblings ...)
2015-04-24 3:35 ` [PATCH 12/14] pkgconfig: Upgrade to latest git tip Khem Raj
@ 2015-04-24 3:35 ` Khem Raj
2015-04-27 15:49 ` Burton, Ross
2015-04-24 3:35 ` [PATCH 14/14] fontconfig: Fix pkgconfig file generation to not have absolute paths Khem Raj
2015-04-24 17:03 ` [PATCH 00/14] Fix world build with gcc-5 Khem Raj
14 siblings, 1 reply; 27+ messages in thread
From: Khem Raj @ 2015-04-24 3:35 UTC (permalink / raw)
To: openembedded-core
LIC_FILES_CHKSUM change is due to shifting of
the hunk to different line numbers, checksum remains same still
Change-Id: I0ce0cc96d39c801e57394f7a839a01d11a6f3979
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../fontconfig/{fontconfig_2.11.1.bb => fontconfig_2.11.93.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-graphics/fontconfig/{fontconfig_2.11.1.bb => fontconfig_2.11.93.bb} (86%)
diff --git a/meta/recipes-graphics/fontconfig/fontconfig_2.11.1.bb b/meta/recipes-graphics/fontconfig/fontconfig_2.11.93.bb
similarity index 86%
rename from meta/recipes-graphics/fontconfig/fontconfig_2.11.1.bb
rename to meta/recipes-graphics/fontconfig/fontconfig_2.11.93.bb
index 7c5b4b4..44cfe2b 100644
--- a/meta/recipes-graphics/fontconfig/fontconfig_2.11.1.bb
+++ b/meta/recipes-graphics/fontconfig/fontconfig_2.11.93.bb
@@ -14,7 +14,7 @@ BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig"
LICENSE = "MIT-style & MIT & PD"
LIC_FILES_CHKSUM = "file://COPYING;md5=7a0449e9bc5370402a94c00204beca3d \
file://src/fcfreetype.c;endline=45;md5=5d9513e3196a1fbfdfa94051c09dfc84 \
- file://src/fccache.c;beginline=1143;endline=1158;md5=0326cfeb4a7333dd4dd25fbbc4b9f27f"
+ file://src/fccache.c;beginline=1199;endline=1214;md5=0326cfeb4a7333dd4dd25fbbc4b9f27f"
SECTION = "libs"
@@ -22,8 +22,8 @@ DEPENDS = "expat freetype zlib"
SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \
"
-SRC_URI[md5sum] = "e75e303b4f7756c2b16203a57ac87eba"
-SRC_URI[sha256sum] = "b6b066c7dce3f436fdc0dfbae9d36122b38094f4f53bd8dffd45e195b0540d8d"
+SRC_URI[md5sum] = "622f94f0f74e40775ea72d7d5f17a36d"
+SRC_URI[sha256sum] = "296b5e83189589e537992d65ff01e0cd74eba9a91eb16a6890ce942e3695c526"
PACKAGES =+ "fontconfig-utils"
FILES_${PN} =+ "${datadir}/xml/*"
--
2.1.4
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH 14/14] fontconfig: Fix pkgconfig file generation to not have absolute paths
2015-04-24 3:35 [PATCH 00/14] Fix world build with gcc-5 Khem Raj
` (12 preceding siblings ...)
2015-04-24 3:35 ` [PATCH 13/14] fontconfig: Upgrade to 2.11.93 Khem Raj
@ 2015-04-24 3:35 ` Khem Raj
2015-04-24 17:03 ` [PATCH 00/14] Fix world build with gcc-5 Khem Raj
14 siblings, 0 replies; 27+ messages in thread
From: Khem Raj @ 2015-04-24 3:35 UTC (permalink / raw)
To: openembedded-core
Fixes cross building dependent packages with gcc-5
e.g. matchbox-panel-2
Change-Id: I6290cfa4aac5d03a7200472d0c713b7ea84b99ac
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../fontconfig/revert-static-pkgconfig.patch | 20 ++++++++++++++++++++
.../fontconfig/fontconfig_2.11.93.bb | 1 +
2 files changed, 21 insertions(+)
create mode 100644 meta/recipes-graphics/fontconfig/fontconfig/revert-static-pkgconfig.patch
diff --git a/meta/recipes-graphics/fontconfig/fontconfig/revert-static-pkgconfig.patch b/meta/recipes-graphics/fontconfig/fontconfig/revert-static-pkgconfig.patch
new file mode 100644
index 0000000..a2f3409
--- /dev/null
+++ b/meta/recipes-graphics/fontconfig/fontconfig/revert-static-pkgconfig.patch
@@ -0,0 +1,20 @@
+Revert part of http://cgit.freedesktop.org/fontconfig/commit/fontconfig.pc.in?id=338ffe6b886ad4ba86ff471cb59c4a5e5ffbe408
+We really dont do static linking so its not going to cause issues for us but as such this is harming us by adding absolute
+paths into -I options into fontconfig.pc which is them prepended with sysroot when read back by cross pkg-config and
+we end up with -I <sysroot>/<sysroot>/usr/include/fontconfig in CFLAGS of clients which depend on it. one such example
+is matchbox-panel-2 and it was working fine with gcc < 5 because it tolerated non-existing paths in -I flags but gcc-5
+gently refuses and rightly so.
+
+Upstream-Status: Not-Submitted [OE-Specific]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Index: fontconfig-2.11.93/fontconfig.pc.in
+===================================================================
+--- fontconfig-2.11.93.orig/fontconfig.pc.in
++++ fontconfig-2.11.93/fontconfig.pc.in
+@@ -15,4 +15,4 @@ Requires: @PKGCONFIG_REQUIRES@
+ Requires.private: @PKGCONFIG_REQUIRES_PRIVATELY@
+ Libs: -L${libdir} -lfontconfig
+ Libs.private: @EXPAT_LIBS@ @FREETYPE_LIBS@ @ICONV_LIBS@ @LIBXML2_LIBS@
+-Cflags: -I${includedir} @EXPAT_CFLAGS@ @FREETYPE_CFLAGS@ @ICONV_CFLAGS@ @LIBXML2_CFLAGS@
++Cflags: -I${includedir}
diff --git a/meta/recipes-graphics/fontconfig/fontconfig_2.11.93.bb b/meta/recipes-graphics/fontconfig/fontconfig_2.11.93.bb
index 44cfe2b..e024adb 100644
--- a/meta/recipes-graphics/fontconfig/fontconfig_2.11.93.bb
+++ b/meta/recipes-graphics/fontconfig/fontconfig_2.11.93.bb
@@ -21,6 +21,7 @@ SECTION = "libs"
DEPENDS = "expat freetype zlib"
SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \
+ file://revert-static-pkgconfig.patch \
"
SRC_URI[md5sum] = "622f94f0f74e40775ea72d7d5f17a36d"
SRC_URI[sha256sum] = "296b5e83189589e537992d65ff01e0cd74eba9a91eb16a6890ce942e3695c526"
--
2.1.4
^ permalink raw reply related [flat|nested] 27+ messages in thread
* Re: [PATCH 02/14] insserv: Fix build with gcc5 and clang
2015-04-24 3:35 ` [PATCH 02/14] insserv: Fix build with gcc5 and clang Khem Raj
@ 2015-04-24 10:17 ` Richard Purdie
2015-04-24 14:39 ` Khem Raj
0 siblings, 1 reply; 27+ messages in thread
From: Richard Purdie @ 2015-04-24 10:17 UTC (permalink / raw)
To: Khem Raj; +Cc: openembedded-core
On Thu, 2015-04-23 at 20:35 -0700, Khem Raj wrote:
> Kill 2 bugs with one patch
I don't mind the patch but does anyone use inserv? Should we remove it?
Cheers,
Richard
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH 02/14] insserv: Fix build with gcc5 and clang
2015-04-24 10:17 ` Richard Purdie
@ 2015-04-24 14:39 ` Khem Raj
0 siblings, 0 replies; 27+ messages in thread
From: Khem Raj @ 2015-04-24 14:39 UTC (permalink / raw)
To: Richard Purdie; +Cc: Patches and discussions about the oe-core layer
On Fri, Apr 24, 2015 at 3:17 AM, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> On Thu, 2015-04-23 at 20:35 -0700, Khem Raj wrote:
>> Kill 2 bugs with one patch
>
> I don't mind the patch but does anyone use inserv? Should we remove it?
I had a usecase with daisy but it ended there. So I am ok to remove it.
>
> Cheers,
>
> Richard
>
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH 00/14] Fix world build with gcc-5
2015-04-24 3:35 [PATCH 00/14] Fix world build with gcc-5 Khem Raj
` (13 preceding siblings ...)
2015-04-24 3:35 ` [PATCH 14/14] fontconfig: Fix pkgconfig file generation to not have absolute paths Khem Raj
@ 2015-04-24 17:03 ` Khem Raj
14 siblings, 0 replies; 27+ messages in thread
From: Khem Raj @ 2015-04-24 17:03 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Thu, Apr 23, 2015 at 8:35 PM, Khem Raj <raj.khem@gmail.com> wrote:
> I saw that my prior pull request has not yet been picked so I took opportunity to update it
> with few more commits and remove the commits not needed for world builds out.
> With these world builds on OE-Core are succeeding for all supported qemu machines
> The gcc upgrade is not yet proposed since we are still in RC phase and as soon as
> 5.1.0 is released I will propose it for OE-Core
so it is release and I have updated the recipes here
http://git.openembedded.org/openembedded-core-contrib/commit/?h=kraj/master&id=99c5806f9e4dc299136244c495eba7dffa8c84a2
world builds on glibc have 1 failure on libunwind/mips but thats a
different problem. all others are green. I have only tried qemu
machines
so no mulilib etc. Once these patches are good with 4.9 and installed.
I will propose it for core. For impatient ones please cherry pick that
1 commit
and try it out in your build configuration and let us know if there
are problems.
>
> Khem Raj (14):
> glibc, packagegroup-self-hosted, packagegroup-core-lsb: Consider
> non-glibc libcs
> insserv: Fix build with gcc5 and clang
> xserver-xorg: Fix build with gcc-5
> u-boot-mkimage: Backport fix from upstream to fix build with gcc-5
> mdadm: Fix inline semantics
> lttng-tools: Add extern qualifier to declarations in .h file
> subversion: Add -P to CPPFLAGS
> gnome-icon-theme: Needs nls.m4
> gtk+: Correct function prototype
> grub: Backport const qualifier fix for gcc-5
> gummiboot: upgrade 43 -> 48+git
> pkgconfig: Upgrade to latest git tip
> fontconfig: Upgrade to 2.11.93
> fontconfig: Fix pkgconfig file generation to not have absolute paths
>
> ..._dhcp_vendor-Add-missing-const-qualifiers.patch | 33 ++
> meta/recipes-bsp/grub/grub2.inc | 1 +
> .../gummiboot/gummiboot/fix-objcopy.patch | 28 +-
> meta/recipes-bsp/gummiboot/gummiboot_git.bb | 4 +-
> meta/recipes-bsp/u-boot/u-boot-mkimage/gcc5.patch | 91 ++++
> meta/recipes-bsp/u-boot/u-boot-mkimage_2015.01.bb | 4 +-
> meta/recipes-core/glibc/glibc_2.21.bb | 8 +-
> .../packagegroups/packagegroup-self-hosted.bb | 7 +-
> .../161_bts777914_fix_undeclared_identifier.patch | 36 ++
> meta/recipes-devtools/insserv/insserv_1.14.0.bb | 1 +
> ...Strip-system-library-directories-reliably.patch | 30 --
> .../pkgconfig/pkgconfig-0.28/autofoo.patch | 528 ---------------------
> .../pkgconfig-0.28/obsolete_automake_macros.patch | 16 -
> meta/recipes-devtools/pkgconfig/pkgconfig.inc | 6 +-
> .../pkgconfig/pkgconfig/autofoo.patch | 528 ---------------------
> .../fix-glib-configure-libtool-usage.patch | 0
> meta/recipes-devtools/pkgconfig/pkgconfig_0.28.bb | 11 -
> meta/recipes-devtools/pkgconfig/pkgconfig_git.bb | 42 +-
> .../subversion/subversion_1.8.11.bb | 3 +-
> meta/recipes-extended/mdadm/files/inline.patch | 39 ++
> meta/recipes-extended/mdadm/mdadm_3.3.2.bb | 1 +
> .../packagegroups/packagegroup-core-lsb.bb | 9 +
> .../recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb | 2 +-
> .../gtk+/gtk+/strict-prototypes.patch | 24 +
> meta/recipes-gnome/gtk+/gtk+_2.24.27.bb | 1 +
> .../fontconfig/revert-static-pkgconfig.patch | 20 +
> ...{fontconfig_2.11.1.bb => fontconfig_2.11.93.bb} | 7 +-
> ...sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch | 50 ++
> .../xorg-xserver/xserver-xorg_1.16.3.bb | 1 +
> .../lttng/lttng-tools/extern-decls.patch | 442 +++++++++++++++++
> meta/recipes-kernel/lttng/lttng-tools_2.6.0.bb | 1 +
> 31 files changed, 794 insertions(+), 1180 deletions(-)
> create mode 100644 meta/recipes-bsp/grub/files/0001-parse_dhcp_vendor-Add-missing-const-qualifiers.patch
> create mode 100644 meta/recipes-bsp/u-boot/u-boot-mkimage/gcc5.patch
> create mode 100644 meta/recipes-devtools/insserv/files/161_bts777914_fix_undeclared_identifier.patch
> delete mode 100644 meta/recipes-devtools/pkgconfig/pkgconfig-0.28/0001-Strip-system-library-directories-reliably.patch
> delete mode 100644 meta/recipes-devtools/pkgconfig/pkgconfig-0.28/autofoo.patch
> delete mode 100644 meta/recipes-devtools/pkgconfig/pkgconfig-0.28/obsolete_automake_macros.patch
> delete mode 100644 meta/recipes-devtools/pkgconfig/pkgconfig/autofoo.patch
> rename meta/recipes-devtools/pkgconfig/{pkgconfig-0.28 => pkgconfig}/fix-glib-configure-libtool-usage.patch (100%)
> delete mode 100644 meta/recipes-devtools/pkgconfig/pkgconfig_0.28.bb
> create mode 100644 meta/recipes-extended/mdadm/files/inline.patch
> create mode 100644 meta/recipes-gnome/gtk+/gtk+/strict-prototypes.patch
> create mode 100644 meta/recipes-graphics/fontconfig/fontconfig/revert-static-pkgconfig.patch
> rename meta/recipes-graphics/fontconfig/{fontconfig_2.11.1.bb => fontconfig_2.11.93.bb} (83%)
> create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch
> create mode 100644 meta/recipes-kernel/lttng/lttng-tools/extern-decls.patch
>
> --
> 2.1.4
>
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH 03/14] xserver-xorg: Fix build with gcc-5
2015-04-24 3:35 ` [PATCH 03/14] xserver-xorg: Fix build with gcc-5 Khem Raj
@ 2015-04-27 14:58 ` Burton, Ross
2015-04-27 14:59 ` Burton, Ross
0 siblings, 1 reply; 27+ messages in thread
From: Burton, Ross @ 2015-04-27 14:58 UTC (permalink / raw)
To: Khem Raj; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 207 bytes --]
On 24 April 2015 at 04:35, Khem Raj <raj.khem@gmail.com> wrote:
> +Upstream-Status: Pending
>
Patches should also have *your* signed-off-by in, so we know who originally
proposed the patch.
Ross
[-- Attachment #2: Type: text/html, Size: 611 bytes --]
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH 03/14] xserver-xorg: Fix build with gcc-5
2015-04-27 14:58 ` Burton, Ross
@ 2015-04-27 14:59 ` Burton, Ross
2015-04-27 15:50 ` Khem Raj
0 siblings, 1 reply; 27+ messages in thread
From: Burton, Ross @ 2015-04-27 14:59 UTC (permalink / raw)
To: Khem Raj; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 473 bytes --]
Oh, and upstream has merged a different fix:
http://cgit.freedesktop.org/xorg/xserver/commit/hw/xfree86/sdksyms.sh?id=21b896939c5bb242f3aacc37baf12379e43254b6
Ross
On 27 April 2015 at 15:58, Burton, Ross <ross.burton@intel.com> wrote:
>
> On 24 April 2015 at 04:35, Khem Raj <raj.khem@gmail.com> wrote:
>
>> +Upstream-Status: Pending
>>
>
> Patches should also have *your* signed-off-by in, so we know who
> originally proposed the patch.
>
> Ross
>
[-- Attachment #2: Type: text/html, Size: 1357 bytes --]
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH 07/14] subversion: Add -P to CPPFLAGS
2015-04-24 3:35 ` [PATCH 07/14] subversion: Add -P to CPPFLAGS Khem Raj
@ 2015-04-27 15:03 ` Burton, Ross
2015-04-27 15:48 ` Khem Raj
0 siblings, 1 reply; 27+ messages in thread
From: Burton, Ross @ 2015-04-27 15:03 UTC (permalink / raw)
To: Khem Raj; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 158 bytes --]
On 24 April 2015 at 04:35, Khem Raj <raj.khem@gmail.com> wrote:
> -inherit gettext
> +inherit gettext pythonnative
>
Why are you doing this?
Ross
[-- Attachment #2: Type: text/html, Size: 530 bytes --]
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH 07/14] subversion: Add -P to CPPFLAGS
2015-04-27 15:03 ` Burton, Ross
@ 2015-04-27 15:48 ` Khem Raj
2015-05-01 20:07 ` Burton, Ross
0 siblings, 1 reply; 27+ messages in thread
From: Khem Raj @ 2015-04-27 15:48 UTC (permalink / raw)
To: Burton, Ross; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 461 bytes --]
> On Apr 27, 2015, at 8:03 AM, Burton, Ross <ross.burton@intel.com> wrote:
>
>
> On 24 April 2015 at 04:35, Khem Raj <raj.khem@gmail.com <mailto:raj.khem@gmail.com>> wrote:
> -inherit gettext
> +inherit gettext pythonnative
>
> Why are you doing this?
Don’t have the error handy right now something swig related, however
because its needing python2 for its bindings and some systems have switched to using python3 as default.
>
> Ross
[-- Attachment #2: Type: text/html, Size: 1432 bytes --]
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH 13/14] fontconfig: Upgrade to 2.11.93
2015-04-24 3:35 ` [PATCH 13/14] fontconfig: Upgrade to 2.11.93 Khem Raj
@ 2015-04-27 15:49 ` Burton, Ross
2015-04-27 15:53 ` Khem Raj
0 siblings, 1 reply; 27+ messages in thread
From: Burton, Ross @ 2015-04-27 15:49 UTC (permalink / raw)
To: Khem Raj; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 2401 bytes --]
This is a development snapshot which the mailing list shows has known
problems. Let's wait for 2.12 or cherry-pick any required fixes.
Ross
On 24 April 2015 at 04:35, Khem Raj <raj.khem@gmail.com> wrote:
> LIC_FILES_CHKSUM change is due to shifting of
> the hunk to different line numbers, checksum remains same still
>
> Change-Id: I0ce0cc96d39c801e57394f7a839a01d11a6f3979
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
> .../fontconfig/{fontconfig_2.11.1.bb => fontconfig_2.11.93.bb} | 6
> +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
> rename meta/recipes-graphics/fontconfig/{fontconfig_2.11.1.bb =>
> fontconfig_2.11.93.bb} (86%)
>
> diff --git a/meta/recipes-graphics/fontconfig/fontconfig_2.11.1.bb
> b/meta/recipes-graphics/fontconfig/fontconfig_2.11.93.bb
> similarity index 86%
> rename from meta/recipes-graphics/fontconfig/fontconfig_2.11.1.bb
> rename to meta/recipes-graphics/fontconfig/fontconfig_2.11.93.bb
> index 7c5b4b4..44cfe2b 100644
> --- a/meta/recipes-graphics/fontconfig/fontconfig_2.11.1.bb
> +++ b/meta/recipes-graphics/fontconfig/fontconfig_2.11.93.bb
> @@ -14,7 +14,7 @@ BUGTRACKER = "
> https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig"
> LICENSE = "MIT-style & MIT & PD"
> LIC_FILES_CHKSUM = "file://COPYING;md5=7a0449e9bc5370402a94c00204beca3d \
>
> file://src/fcfreetype.c;endline=45;md5=5d9513e3196a1fbfdfa94051c09dfc84 \
> -
> file://src/fccache.c;beginline=1143;endline=1158;md5=0326cfeb4a7333dd4dd25fbbc4b9f27f"
> +
> file://src/fccache.c;beginline=1199;endline=1214;md5=0326cfeb4a7333dd4dd25fbbc4b9f27f"
>
> SECTION = "libs"
>
> @@ -22,8 +22,8 @@ DEPENDS = "expat freetype zlib"
>
> SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \
> "
> -SRC_URI[md5sum] = "e75e303b4f7756c2b16203a57ac87eba"
> -SRC_URI[sha256sum] =
> "b6b066c7dce3f436fdc0dfbae9d36122b38094f4f53bd8dffd45e195b0540d8d"
> +SRC_URI[md5sum] = "622f94f0f74e40775ea72d7d5f17a36d"
> +SRC_URI[sha256sum] =
> "296b5e83189589e537992d65ff01e0cd74eba9a91eb16a6890ce942e3695c526"
>
> PACKAGES =+ "fontconfig-utils"
> FILES_${PN} =+ "${datadir}/xml/*"
> --
> 2.1.4
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
[-- Attachment #2: Type: text/html, Size: 4049 bytes --]
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH 03/14] xserver-xorg: Fix build with gcc-5
2015-04-27 14:59 ` Burton, Ross
@ 2015-04-27 15:50 ` Khem Raj
0 siblings, 0 replies; 27+ messages in thread
From: Khem Raj @ 2015-04-27 15:50 UTC (permalink / raw)
To: Burton, Ross; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 818 bytes --]
> On Apr 27, 2015, at 7:59 AM, Burton, Ross <ross.burton@intel.com> wrote:
>
> Oh, and upstream has merged a different fix:
>
> http://cgit.freedesktop.org/xorg/xserver/commit/hw/xfree86/sdksyms.sh?id=21b896939c5bb242f3aacc37baf12379e43254b6 <http://cgit.freedesktop.org/xorg/xserver/commit/hw/xfree86/sdksyms.sh?id=21b896939c5bb242f3aacc37baf12379e43254b6>
>
thats the proper fix IMO. Let me see if I can test a back port of it today.
> Ross
>
> On 27 April 2015 at 15:58, Burton, Ross <ross.burton@intel.com <mailto:ross.burton@intel.com>> wrote:
>
> On 24 April 2015 at 04:35, Khem Raj <raj.khem@gmail.com <mailto:raj.khem@gmail.com>> wrote:
> +Upstream-Status: Pending
>
> Patches should also have *your* signed-off-by in, so we know who originally proposed the patch.
>
> Ross
>
[-- Attachment #2: Type: text/html, Size: 2307 bytes --]
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH 13/14] fontconfig: Upgrade to 2.11.93
2015-04-27 15:49 ` Burton, Ross
@ 2015-04-27 15:53 ` Khem Raj
0 siblings, 0 replies; 27+ messages in thread
From: Khem Raj @ 2015-04-27 15:53 UTC (permalink / raw)
To: Burton, Ross; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 3210 bytes --]
> On Apr 27, 2015, at 8:49 AM, Burton, Ross <ross.burton@intel.com> wrote:
>
> This is a development snapshot which the mailing list shows has known problems. Let's wait for 2.12 or cherry-pick any required fixes.
fair enough. I will have to dig into what needs to be back ported.
>
> Ross
>
> On 24 April 2015 at 04:35, Khem Raj <raj.khem@gmail.com <mailto:raj.khem@gmail.com>> wrote:
> LIC_FILES_CHKSUM change is due to shifting of
> the hunk to different line numbers, checksum remains same still
>
> Change-Id: I0ce0cc96d39c801e57394f7a839a01d11a6f3979
> Signed-off-by: Khem Raj <raj.khem@gmail.com <mailto:raj.khem@gmail.com>>
> ---
> .../fontconfig/{fontconfig_2.11.1.bb <http://fontconfig_2.11.1.bb/> => fontconfig_2.11.93.bb <http://fontconfig_2.11.93.bb/>} | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
> rename meta/recipes-graphics/fontconfig/{fontconfig_2.11.1.bb <http://fontconfig_2.11.1.bb/> => fontconfig_2.11.93.bb <http://fontconfig_2.11.93.bb/>} (86%)
>
> diff --git a/meta/recipes-graphics/fontconfig/fontconfig_2.11.1.bb <http://fontconfig_2.11.1.bb/> b/meta/recipes-graphics/fontconfig/fontconfig_2.11.93.bb <http://fontconfig_2.11.93.bb/>
> similarity index 86%
> rename from meta/recipes-graphics/fontconfig/fontconfig_2.11.1.bb <http://fontconfig_2.11.1.bb/>
> rename to meta/recipes-graphics/fontconfig/fontconfig_2.11.93.bb <http://fontconfig_2.11.93.bb/>
> index 7c5b4b4..44cfe2b 100644
> --- a/meta/recipes-graphics/fontconfig/fontconfig_2.11.1.bb <http://fontconfig_2.11.1.bb/>
> +++ b/meta/recipes-graphics/fontconfig/fontconfig_2.11.93.bb <http://fontconfig_2.11.93.bb/>
> @@ -14,7 +14,7 @@ BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig <https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig>"
> LICENSE = "MIT-style & MIT & PD"
> LIC_FILES_CHKSUM = "file://COPYING;md5=7a0449e9bc5370402a94c00204beca3d \
> file://src/fcfreetype.c;endline=45;md5=5d9513e3196a1fbfdfa94051c09dfc84 \
> - file://src/fccache.c;beginline=1143;endline=1158;md5=0326cfeb4a7333dd4dd25fbbc4b9f27f"
> + file://src/fccache.c;beginline=1199;endline=1214;md5=0326cfeb4a7333dd4dd25fbbc4b9f27f"
>
> SECTION = "libs"
>
> @@ -22,8 +22,8 @@ DEPENDS = "expat freetype zlib"
>
> SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz <http://fontconfig.org/release/fontconfig-${PV}.tar.gz> \
> "
> -SRC_URI[md5sum] = "e75e303b4f7756c2b16203a57ac87eba"
> -SRC_URI[sha256sum] = "b6b066c7dce3f436fdc0dfbae9d36122b38094f4f53bd8dffd45e195b0540d8d"
> +SRC_URI[md5sum] = "622f94f0f74e40775ea72d7d5f17a36d"
> +SRC_URI[sha256sum] = "296b5e83189589e537992d65ff01e0cd74eba9a91eb16a6890ce942e3695c526"
>
> PACKAGES =+ "fontconfig-utils"
> FILES_${PN} =+ "${datadir}/xml/*"
> --
> 2.1.4
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org <mailto:Openembedded-core@lists.openembedded.org>
> http://lists.openembedded.org/mailman/listinfo/openembedded-core <http://lists.openembedded.org/mailman/listinfo/openembedded-core>
>
[-- Attachment #2: Type: text/html, Size: 5876 bytes --]
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH 07/14] subversion: Add -P to CPPFLAGS
2015-04-27 15:48 ` Khem Raj
@ 2015-05-01 20:07 ` Burton, Ross
2015-05-01 20:17 ` Khem Raj
0 siblings, 1 reply; 27+ messages in thread
From: Burton, Ross @ 2015-05-01 20:07 UTC (permalink / raw)
To: Khem Raj; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 373 bytes --]
On 27 April 2015 at 16:48, Khem Raj <raj.khem@gmail.com> wrote:
> Don’t have the error handy right now something swig related, however
> because its needing python2 for its bindings and some systems have
> switched to using python3 as default.
>
Requiring a fresh install of Python 2.x when we can just force the python
version seems overkill to me...
Ross
[-- Attachment #2: Type: text/html, Size: 760 bytes --]
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH 07/14] subversion: Add -P to CPPFLAGS
2015-05-01 20:07 ` Burton, Ross
@ 2015-05-01 20:17 ` Khem Raj
0 siblings, 0 replies; 27+ messages in thread
From: Khem Raj @ 2015-05-01 20:17 UTC (permalink / raw)
To: Burton, Ross; +Cc: OE-core
On Fri, May 1, 2015 at 1:07 PM, Burton, Ross <ross.burton@intel.com> wrote:
> Requiring a fresh install of Python 2.x when we can just force the python
> version seems overkill to me...
not all python2 versions are same as well. but may thats not affecting
this case I am not sure. But for improving
first time builds is probably a good reason at the expense of determinism.
^ permalink raw reply [flat|nested] 27+ messages in thread
end of thread, other threads:[~2015-05-01 20:17 UTC | newest]
Thread overview: 27+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-04-24 3:35 [PATCH 00/14] Fix world build with gcc-5 Khem Raj
2015-04-24 3:35 ` [PATCH 01/14] glibc, packagegroup-self-hosted, packagegroup-core-lsb: Consider non-glibc libcs Khem Raj
2015-04-24 3:35 ` [PATCH 02/14] insserv: Fix build with gcc5 and clang Khem Raj
2015-04-24 10:17 ` Richard Purdie
2015-04-24 14:39 ` Khem Raj
2015-04-24 3:35 ` [PATCH 03/14] xserver-xorg: Fix build with gcc-5 Khem Raj
2015-04-27 14:58 ` Burton, Ross
2015-04-27 14:59 ` Burton, Ross
2015-04-27 15:50 ` Khem Raj
2015-04-24 3:35 ` [PATCH 04/14] u-boot-mkimage: Backport fix from upstream to fix " Khem Raj
2015-04-24 3:35 ` [PATCH 05/14] mdadm: Fix inline semantics Khem Raj
2015-04-24 3:35 ` [PATCH 06/14] lttng-tools: Add extern qualifier to declarations in .h file Khem Raj
2015-04-24 3:35 ` [PATCH 07/14] subversion: Add -P to CPPFLAGS Khem Raj
2015-04-27 15:03 ` Burton, Ross
2015-04-27 15:48 ` Khem Raj
2015-05-01 20:07 ` Burton, Ross
2015-05-01 20:17 ` Khem Raj
2015-04-24 3:35 ` [PATCH 08/14] gnome-icon-theme: Needs nls.m4 Khem Raj
2015-04-24 3:35 ` [PATCH 09/14] gtk+: Correct function prototype Khem Raj
2015-04-24 3:35 ` [PATCH 10/14] grub: Backport const qualifier fix for gcc-5 Khem Raj
2015-04-24 3:35 ` [PATCH 11/14] gummiboot: upgrade 43 -> 48+git Khem Raj
2015-04-24 3:35 ` [PATCH 12/14] pkgconfig: Upgrade to latest git tip Khem Raj
2015-04-24 3:35 ` [PATCH 13/14] fontconfig: Upgrade to 2.11.93 Khem Raj
2015-04-27 15:49 ` Burton, Ross
2015-04-27 15:53 ` Khem Raj
2015-04-24 3:35 ` [PATCH 14/14] fontconfig: Fix pkgconfig file generation to not have absolute paths Khem Raj
2015-04-24 17:03 ` [PATCH 00/14] Fix world build with gcc-5 Khem Raj
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.