| 1 |
commit: d8a4eca97c26279ab339be03dd587ff25644d851 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 3 18:14:18 2017 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 3 18:15:00 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8a4eca9 |
| 7 |
|
| 8 |
sys-apps/systemd: backport lz4 version check fix |
| 9 |
|
| 10 |
226 does not check the version at all, so skip it. |
| 11 |
|
| 12 |
Bug: https://bugs.gentoo.org/595210 |
| 13 |
Package-Manager: Portage-2.3.3_p13, Repoman-2.3.1_p6 |
| 14 |
|
| 15 |
sys-apps/systemd/files/232-lz4-version.patch | 44 ++++++++++++++++++++++++++++ |
| 16 |
sys-apps/systemd/systemd-231.ebuild | 3 +- |
| 17 |
sys-apps/systemd/systemd-232.ebuild | 3 +- |
| 18 |
3 files changed, 48 insertions(+), 2 deletions(-) |
| 19 |
|
| 20 |
diff --git a/sys-apps/systemd/files/232-lz4-version.patch b/sys-apps/systemd/files/232-lz4-version.patch |
| 21 |
new file mode 100644 |
| 22 |
index 00000000..d99ceda |
| 23 |
--- /dev/null |
| 24 |
+++ b/sys-apps/systemd/files/232-lz4-version.patch |
| 25 |
@@ -0,0 +1,44 @@ |
| 26 |
+From 3d4cf7de48a74726694abbaa09f9804b845ff3ba Mon Sep 17 00:00:00 2001 |
| 27 |
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@××××××.pl> |
| 28 |
+Date: Wed, 23 Nov 2016 10:18:30 -0500 |
| 29 |
+Subject: [PATCH] build-sys: check for lz4 in the old and new numbering scheme |
| 30 |
+ (#4717) |
| 31 |
+ |
| 32 |
+lz4 upstream decided to switch to an incompatible numbering scheme |
| 33 |
+(1.7.3 follows 131, to match the so version). |
| 34 |
+PKG_CHECK_MODULES does not allow two version matches for the same package, |
| 35 |
+so e.g. lz4 < 10 || lz4 >= 125 cannot be used. Check twice, once for |
| 36 |
+"new" numbers (anything below 10 is assume to be new), once for the "old" |
| 37 |
+numbers (anything above >= 125). This assumes that the "new" versioning |
| 38 |
+will not get to 10 to quickly. I think that's a safe assumption, lz4 is a |
| 39 |
+mature project. |
| 40 |
+ |
| 41 |
+Fixed #4690. |
| 42 |
+--- |
| 43 |
+ configure.ac | 9 ++++++--- |
| 44 |
+ 1 file changed, 6 insertions(+), 3 deletions(-) |
| 45 |
+ |
| 46 |
+diff --git a/configure.ac b/configure.ac |
| 47 |
+index 65eaae1ae..5979de4dc 100644 |
| 48 |
+--- a/configure.ac |
| 49 |
++++ b/configure.ac |
| 50 |
+@@ -621,10 +621,13 @@ AM_CONDITIONAL(HAVE_BZIP2, [test "$have_bzip2" = "yes"]) |
| 51 |
+ have_lz4=no |
| 52 |
+ AC_ARG_ENABLE(lz4, AS_HELP_STRING([--disable-lz4], [disable optional LZ4 support])) |
| 53 |
+ AS_IF([test "x$enable_lz4" != "xno"], [ |
| 54 |
+- PKG_CHECK_MODULES(LZ4, [ liblz4 >= 125 ], |
| 55 |
+- [AC_DEFINE(HAVE_LZ4, 1, [Define in LZ4 is available]) |
| 56 |
++ PKG_CHECK_MODULES(LZ4, [ liblz4 < 10 ], |
| 57 |
++ [AC_DEFINE(HAVE_LZ4, 1, [Define if LZ4 is available]) |
| 58 |
+ have_lz4=yes], |
| 59 |
+- have_lz4=no) |
| 60 |
++ [PKG_CHECK_MODULES(LZ4, [ liblz4 >= 125 ], |
| 61 |
++ [AC_DEFINE(HAVE_LZ4, 1, [Define if LZ4 is available]) |
| 62 |
++ have_lz4=yes], |
| 63 |
++ have_lz4=no)]) |
| 64 |
+ AS_IF([test "x$have_lz4" = xno -a "x$enable_lz4" = xyes], |
| 65 |
+ [AC_MSG_ERROR([*** LZ4 support requested but libraries not found])]) |
| 66 |
+ ]) |
| 67 |
+-- |
| 68 |
+2.11.0 |
| 69 |
+ |
| 70 |
|
| 71 |
diff --git a/sys-apps/systemd/systemd-231.ebuild b/sys-apps/systemd/systemd-231.ebuild |
| 72 |
index 1561160..e27e74f 100644 |
| 73 |
--- a/sys-apps/systemd/systemd-231.ebuild |
| 74 |
+++ b/sys-apps/systemd/systemd-231.ebuild |
| 75 |
@@ -1,4 +1,4 @@ |
| 76 |
-# Copyright 1999-2016 Gentoo Foundation |
| 77 |
+# Copyright 1999-2017 Gentoo Foundation |
| 78 |
# Distributed under the terms of the GNU General Public License v2 |
| 79 |
# $Id$ |
| 80 |
|
| 81 |
@@ -162,6 +162,7 @@ src_prepare() { |
| 82 |
sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die |
| 83 |
|
| 84 |
local PATCHES=( |
| 85 |
+ "${FILESDIR}/232-lz4-version.patch" |
| 86 |
"${FILESDIR}/218-Dont-enable-audit-by-default.patch" |
| 87 |
"${FILESDIR}/228-noclean-tmp.patch" |
| 88 |
) |
| 89 |
|
| 90 |
diff --git a/sys-apps/systemd/systemd-232.ebuild b/sys-apps/systemd/systemd-232.ebuild |
| 91 |
index 431852f..d2e71ed 100644 |
| 92 |
--- a/sys-apps/systemd/systemd-232.ebuild |
| 93 |
+++ b/sys-apps/systemd/systemd-232.ebuild |
| 94 |
@@ -1,4 +1,4 @@ |
| 95 |
-# Copyright 1999-2016 Gentoo Foundation |
| 96 |
+# Copyright 1999-2017 Gentoo Foundation |
| 97 |
# Distributed under the terms of the GNU General Public License v2 |
| 98 |
# $Id$ |
| 99 |
|
| 100 |
@@ -150,6 +150,7 @@ src_prepare() { |
| 101 |
sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die |
| 102 |
|
| 103 |
local PATCHES=( |
| 104 |
+ "${FILESDIR}/232-lz4-version.patch" |
| 105 |
) |
| 106 |
|
| 107 |
if ! use vanilla; then |
Archives