diff options
Diffstat (limited to 'meta/recipes-core/systemd/systemd')
-rw-r--r-- | meta/recipes-core/systemd/systemd/0021-build-sys-check-for-lz4-in-the-old-and-new-numbering.patch | 51 |
1 files changed, 51 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 @@ | |||
1 | From 8200002233bd40acda4bbfb991a31d87f4224fea Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl> | ||
3 | Date: Wed, 23 Nov 2016 10:18:30 -0500 | ||
4 | Subject: [PATCH 21/21] build-sys: check for lz4 in the old and new numbering | ||
5 | scheme (#4717) | ||
6 | MIME-Version: 1.0 | ||
7 | Content-Type: text/plain; charset=UTF-8 | ||
8 | Content-Transfer-Encoding: 8bit | ||
9 | |||
10 | lz4 upstream decided to switch to an incompatible numbering scheme | ||
11 | (1.7.3 follows 131, to match the so version). | ||
12 | PKG_CHECK_MODULES does not allow two version matches for the same package, | ||
13 | so 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" | ||
15 | numbers (anything above >= 125). This assumes that the "new" versioning | ||
16 | will not get to 10 to quickly. I think that's a safe assumption, lz4 is a | ||
17 | mature project. | ||
18 | |||
19 | Fixed #4690. | ||
20 | |||
21 | Upstream-Status: Backport | ||
22 | |||
23 | Signed-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 | |||
28 | diff --git a/configure.ac b/configure.ac | ||
29 | index 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 | -- | ||
50 | 1.9.1 | ||
51 | |||