summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2017-01-16 11:20:18 -0500
committerMike Gilbert <floppym@gentoo.org>2017-01-16 11:20:18 -0500
commitdf8286a945b79614fcfd6e2b3bc35acc72f4450d (patch)
tree7d22e3edb3e58282e460011d6834bc1ae7fc5e9a /sys-boot
parentsys-boot/systemd-boot: fix build with gperf-3.1 (diff)
downloadgentoo-df8286a945b79614fcfd6e2b3bc35acc72f4450d.tar.gz
gentoo-df8286a945b79614fcfd6e2b3bc35acc72f4450d.tar.bz2
gentoo-df8286a945b79614fcfd6e2b3bc35acc72f4450d.zip
sys-boot/systemd-boot: drop unused patch
Package-Manager: Portage-2.3.3_p32, Repoman-2.3.1_p25
Diffstat (limited to 'sys-boot')
-rw-r--r--sys-boot/systemd-boot/files/232-0001-build-sys-check-for-lz4-in-the-old-and-new-numbering.patch44
1 files changed, 0 insertions, 44 deletions
diff --git a/sys-boot/systemd-boot/files/232-0001-build-sys-check-for-lz4-in-the-old-and-new-numbering.patch b/sys-boot/systemd-boot/files/232-0001-build-sys-check-for-lz4-in-the-old-and-new-numbering.patch
deleted file mode 100644
index 788f0aa15c7..00000000000
--- a/sys-boot/systemd-boot/files/232-0001-build-sys-check-for-lz4-in-the-old-and-new-numbering.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 63621678f44325b4c48574f9c9d7a3c499d1a608 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
-Date: Wed, 23 Nov 2016 10:18:30 -0500
-Subject: [PATCH 1/2] build-sys: check for lz4 in the old and new numbering
- scheme (#4717)
-
-lz4 upstream decided to switch to an incompatible numbering scheme
-(1.7.3 follows 131, to match the so version).
-PKG_CHECK_MODULES does not allow two version matches for the same package,
-so e.g. lz4 < 10 || lz4 >= 125 cannot be used. Check twice, once for
-"new" numbers (anything below 10 is assume to be new), once for the "old"
-numbers (anything above >= 125). This assumes that the "new" versioning
-will not get to 10 to quickly. I think that's a safe assumption, lz4 is a
-mature project.
-
-Fixed #4690.
----
- configure.ac | 9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 0b10fc7de..1928e65bd 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -623,10 +623,13 @@ AM_CONDITIONAL(HAVE_BZIP2, [test "$have_bzip2" = "yes"])
- have_lz4=no
- AC_ARG_ENABLE(lz4, AS_HELP_STRING([--disable-lz4], [Disable optional LZ4 support]))
- AS_IF([test "x$enable_lz4" != "xno"], [
-- PKG_CHECK_MODULES(LZ4, [ liblz4 >= 125 ],
-- [AC_DEFINE(HAVE_LZ4, 1, [Define in LZ4 is available])
-+ PKG_CHECK_MODULES(LZ4, [ liblz4 < 10 ],
-+ [AC_DEFINE(HAVE_LZ4, 1, [Define if LZ4 is available])
- have_lz4=yes],
-- have_lz4=no)
-+ [PKG_CHECK_MODULES(LZ4, [ liblz4 >= 125 ],
-+ [AC_DEFINE(HAVE_LZ4, 1, [Define if LZ4 is available])
-+ have_lz4=yes],
-+ have_lz4=no)])
- AS_IF([test "x$have_lz4" = xno -a "x$enable_lz4" = xyes],
- [AC_MSG_ERROR([*** LZ4 support requested but libraries not found])])
- ])
---
-2.11.0
-