summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Müller-Klieser <s.mueller-klieser@phytec.de>2017-05-18 15:25:35 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-05-25 23:59:31 +0100
commitac344766f09a10ddaed716f95cdfe3badb5345f7 (patch)
treec813fa385c34ba36c30e2ad2b01619d51afe915c
parent2d1c14907983ffa12dfb9f8fc70b9a695e09de25 (diff)
downloadpoky-ac344766f09a10ddaed716f95cdfe3badb5345f7.tar.gz
systemd: fix lz4 build
Updating lz4 in oe-core required back porting 3d4cf7de48a from master, as versioning scheme changed. (From OE-Core rev: ba71820ea16f2ee990dfca98b390d4ff586b7a49) Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/systemd/systemd/0021-build-sys-check-for-lz4-in-the-old-and-new-numbering.patch51
-rw-r--r--meta/recipes-core/systemd/systemd_232.bb1
2 files changed, 52 insertions, 0 deletions
diff --git a/meta/recipes-core/systemd/systemd/0021-build-sys-check-for-lz4-in-the-old-and-new-numbering.patch b/meta/recipes-core/systemd/systemd/0021-build-sys-check-for-lz4-in-the-old-and-new-numbering.patch
new file mode 100644
index 0000000000..a7d7461bc8
--- /dev/null
+++ b/meta/recipes-core/systemd/systemd/0021-build-sys-check-for-lz4-in-the-old-and-new-numbering.patch
@@ -0,0 +1,51 @@
1From 8200002233bd40acda4bbfb991a31d87f4224fea Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
3Date: Wed, 23 Nov 2016 10:18:30 -0500
4Subject: [PATCH 21/21] build-sys: check for lz4 in the old and new numbering
5 scheme (#4717)
6MIME-Version: 1.0
7Content-Type: text/plain; charset=UTF-8
8Content-Transfer-Encoding: 8bit
9
10lz4 upstream decided to switch to an incompatible numbering scheme
11(1.7.3 follows 131, to match the so version).
12PKG_CHECK_MODULES does not allow two version matches for the same package,
13so e.g. lz4 < 10 || lz4 >= 125 cannot be used. Check twice, once for
14"new" numbers (anything below 10 is assume to be new), once for the "old"
15numbers (anything above >= 125). This assumes that the "new" versioning
16will not get to 10 to quickly. I think that's a safe assumption, lz4 is a
17mature project.
18
19Fixed #4690.
20
21Upstream-Status: Backport
22
23Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de>
24---
25 configure.ac | 9 ++++++---
26 1 file changed, 6 insertions(+), 3 deletions(-)
27
28diff --git a/configure.ac b/configure.ac
29index 279ce28..782b5d7 100644
30--- a/configure.ac
31+++ b/configure.ac
32@@ -640,10 +640,13 @@ AM_CONDITIONAL(HAVE_BZIP2, [test "$have_bzip2" = "yes"])
33 have_lz4=no
34 AC_ARG_ENABLE(lz4, AS_HELP_STRING([--disable-lz4], [Disable optional LZ4 support]))
35 AS_IF([test "x$enable_lz4" != "xno"], [
36- PKG_CHECK_MODULES(LZ4, [ liblz4 >= 125 ],
37- [AC_DEFINE(HAVE_LZ4, 1, [Define in LZ4 is available])
38+ PKG_CHECK_MODULES(LZ4, [ liblz4 < 10 ],
39+ [AC_DEFINE(HAVE_LZ4, 1, [Define if LZ4 is available])
40 have_lz4=yes],
41- have_lz4=no)
42+ [PKG_CHECK_MODULES(LZ4, [ liblz4 >= 125 ],
43+ [AC_DEFINE(HAVE_LZ4, 1, [Define if LZ4 is available])
44+ have_lz4=yes],
45+ have_lz4=no)])
46 AS_IF([test "x$have_lz4" = xno -a "x$enable_lz4" = xyes],
47 [AC_MSG_ERROR([*** LZ4 support requested but libraries not found])])
48 ])
49--
501.9.1
51
diff --git a/meta/recipes-core/systemd/systemd_232.bb b/meta/recipes-core/systemd/systemd_232.bb
index 398cb46f0d..6513054471 100644
--- a/meta/recipes-core/systemd/systemd_232.bb
+++ b/meta/recipes-core/systemd/systemd_232.bb
@@ -33,6 +33,7 @@ SRC_URI += " \
33 file://0018-check-for-uchar.h-in-configure.patch \ 33 file://0018-check-for-uchar.h-in-configure.patch \
34 file://0019-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch \ 34 file://0019-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch \
35 file://0020-back-port-233-don-t-use-the-unified-hierarchy-for-the-systemd.patch \ 35 file://0020-back-port-233-don-t-use-the-unified-hierarchy-for-the-systemd.patch \
36 file://0021-build-sys-check-for-lz4-in-the-old-and-new-numbering.patch \
36" 37"
37SRC_URI_append_libc-uclibc = "\ 38SRC_URI_append_libc-uclibc = "\
38 file://0002-units-Prefer-getty-to-agetty-in-console-setup-system.patch \ 39 file://0002-units-Prefer-getty-to-agetty-in-console-setup-system.patch \