[gnome-continuous-yocto/gnomeostree-3.28-rocko: 6883/8267] systemd-bootchart: Fix build with glibc 2.26
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-continuous-yocto/gnomeostree-3.28-rocko: 6883/8267] systemd-bootchart: Fix build with glibc 2.26
- Date: Sun, 17 Dec 2017 05:28:11 +0000 (UTC)
commit dfd6b60a31af5714ea0f95287d55fee4f3bb4a6f
Author: Jussi Kukkonen <jussi kukkonen intel com>
Date: Tue Jul 18 13:52:29 2017 +0300
systemd-bootchart: Fix build with glibc 2.26
xlocale.h is no more, don't include it.
(From OE-Core rev: 4fdc7841a1ec5dfc0a3a3af5e630c9def7a66a24)
Signed-off-by: Jussi Kukkonen <jussi kukkonen intel com>
Signed-off-by: Ross Burton <ross burton intel com>
Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>
.../0001-parse-util-Don-t-use-xlocale.h.patch | 32 ++++++++++++++++++++
.../systemd-bootchart/systemd-bootchart_231.bb | 4 ++-
2 files changed, 35 insertions(+), 1 deletions(-)
---
diff --git a/meta/recipes-devtools/systemd-bootchart/files/0001-parse-util-Don-t-use-xlocale.h.patch
b/meta/recipes-devtools/systemd-bootchart/files/0001-parse-util-Don-t-use-xlocale.h.patch
new file mode 100644
index 0000000..5aa0463
--- /dev/null
+++ b/meta/recipes-devtools/systemd-bootchart/files/0001-parse-util-Don-t-use-xlocale.h.patch
@@ -0,0 +1,32 @@
+From d379126d56d0b6e935b2d97ca71579e6cc54d1bb Mon Sep 17 00:00:00 2001
+From: Jussi Kukkonen <jussi kukkonen intel com>
+Date: Tue, 18 Jul 2017 13:37:27 +0300
+Subject: [PATCH] parse-util: Don't use xlocale.h
+
+glibc 2.26 no longer contains the non-standard xlocale.h
+(http://sourceware.org/glibc/wiki/Release/2.26#Removal_of_.27xlocale.h.27)
+
+This change shouldn't break anything as xlocale.h was a subset of
+locale.h.
+
+Signed-off-by: Jussi Kukkonen <jussi kukkonen intel com>
+Upstream-Status: Submitted [https://github.com/systemd/systemd-bootchart/pull/35]
+---
+ src/parse-util.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/parse-util.c b/src/parse-util.c
+index 5635a68..1b2169c 100644
+--- a/src/parse-util.c
++++ b/src/parse-util.c
+@@ -21,7 +21,6 @@
+ #include <locale.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <xlocale.h>
+
+ #include "macro.h"
+ #include "parse-util.h"
+--
+2.13.2
+
diff --git a/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_231.bb
b/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_231.bb
index 1d88036..4da000e 100644
--- a/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_231.bb
+++ b/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_231.bb
@@ -2,7 +2,9 @@ LICENSE = "LGPLv2.1 & GPLv2"
LIC_FILES_CHKSUM = "file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c \
file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe"
-SRC_URI = "git://github.com/systemd/systemd-bootchart.git;protocol=https"
+SRC_URI = "git://github.com/systemd/systemd-bootchart.git;protocol=https \
+ file://0001-parse-util-Don-t-use-xlocale.h.patch \
+"
# Modify these as desired
PV = "231+git${SRCPV}"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]