diff options
| author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2017-07-18 13:52:29 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-07-21 22:51:38 +0100 |
| commit | dfd6b60a31af5714ea0f95287d55fee4f3bb4a6f (patch) | |
| tree | 26459c13bcc39f53d45667b1f7992a58d291242e /meta/recipes-devtools/systemd-bootchart | |
| parent | 405f210b4b154f996903d19e88bb15374ca3ee0b (diff) | |
| download | poky-dfd6b60a31af5714ea0f95287d55fee4f3bb4a6f.tar.gz | |
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>
Diffstat (limited to 'meta/recipes-devtools/systemd-bootchart')
| -rw-r--r-- | meta/recipes-devtools/systemd-bootchart/files/0001-parse-util-Don-t-use-xlocale.h.patch | 32 | ||||
| -rw-r--r-- | meta/recipes-devtools/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 0000000000..5aa0463ac8 --- /dev/null +++ b/meta/recipes-devtools/systemd-bootchart/files/0001-parse-util-Don-t-use-xlocale.h.patch | |||
| @@ -0,0 +1,32 @@ | |||
| 1 | From d379126d56d0b6e935b2d97ca71579e6cc54d1bb Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
| 3 | Date: Tue, 18 Jul 2017 13:37:27 +0300 | ||
| 4 | Subject: [PATCH] parse-util: Don't use xlocale.h | ||
| 5 | |||
| 6 | glibc 2.26 no longer contains the non-standard xlocale.h | ||
| 7 | (http://sourceware.org/glibc/wiki/Release/2.26#Removal_of_.27xlocale.h.27) | ||
| 8 | |||
| 9 | This change shouldn't break anything as xlocale.h was a subset of | ||
| 10 | locale.h. | ||
| 11 | |||
| 12 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
| 13 | Upstream-Status: Submitted [https://github.com/systemd/systemd-bootchart/pull/35] | ||
| 14 | --- | ||
| 15 | src/parse-util.c | 1 - | ||
| 16 | 1 file changed, 1 deletion(-) | ||
| 17 | |||
| 18 | diff --git a/src/parse-util.c b/src/parse-util.c | ||
| 19 | index 5635a68..1b2169c 100644 | ||
| 20 | --- a/src/parse-util.c | ||
| 21 | +++ b/src/parse-util.c | ||
| 22 | @@ -21,7 +21,6 @@ | ||
| 23 | #include <locale.h> | ||
| 24 | #include <stdlib.h> | ||
| 25 | #include <string.h> | ||
| 26 | -#include <xlocale.h> | ||
| 27 | |||
| 28 | #include "macro.h" | ||
| 29 | #include "parse-util.h" | ||
| 30 | -- | ||
| 31 | 2.13.2 | ||
| 32 | |||
diff --git a/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_231.bb b/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_231.bb index 1d8803616a..4da000e5d0 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" | |||
| 2 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c \ | 2 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c \ |
| 3 | file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe" | 3 | file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe" |
| 4 | 4 | ||
| 5 | SRC_URI = "git://github.com/systemd/systemd-bootchart.git;protocol=https" | 5 | SRC_URI = "git://github.com/systemd/systemd-bootchart.git;protocol=https \ |
| 6 | file://0001-parse-util-Don-t-use-xlocale.h.patch \ | ||
| 7 | " | ||
| 6 | 8 | ||
| 7 | # Modify these as desired | 9 | # Modify these as desired |
| 8 | PV = "231+git${SRCPV}" | 10 | PV = "231+git${SRCPV}" |
