diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-10-29 18:32:51 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-10-29 21:54:42 +0100 |
| commit | e0a1d4b049e6991919a0eacd5d96f7f39dc6ddd1 (patch) | |
| tree | 6f2d03921940d335d49d732e0d5a541c49308aa5 | |
| parent | 2b686260894ee0fda9ed75572735e750828605ca (diff) | |
| download | systemd-e0a1d4b049e6991919a0eacd5d96f7f39dc6ddd1.tar.gz systemd-e0a1d4b049e6991919a0eacd5d96f7f39dc6ddd1.tar.bz2 systemd-e0a1d4b049e6991919a0eacd5d96f7f39dc6ddd1.zip | |
Drop support for lz4 < 1.3.0
lz4-r130 was released on May 29th, 2015. Let's drop the work-around for older
versions. In particular, we won't test any new code against those ancient
releases, so we shouldn't pretend they are supported.
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | meson.build | 1 | ||||
| -rw-r--r-- | src/journal/compress.c | 4 | ||||
| -rw-r--r-- | src/journal/test-compress.c | 4 |
4 files changed, 2 insertions, 9 deletions
@@ -148,7 +148,7 @@ REQUIREMENTS: libacl (optional) libselinux (optional) liblzma (optional) - liblz4 >= 119 (optional) + liblz4 >= 1.3.0 / 130 (optional) libgcrypt (optional) libqrencode (optional) libmicrohttpd (optional) diff --git a/meson.build b/meson.build index 3b01021562..a0e0305e02 100644 --- a/meson.build +++ b/meson.build @@ -1092,6 +1092,7 @@ conf.set10('HAVE_XZ', have) want_lz4 = get_option('lz4') if want_lz4 != 'false' and not fuzzer_build liblz4 = dependency('liblz4', + version : '>= 1.3.0', required : want_lz4 == 'true') have = liblz4.found() else diff --git a/src/journal/compress.c b/src/journal/compress.c index 6baf15c8ff..a4a5e63840 100644 --- a/src/journal/compress.c +++ b/src/journal/compress.c @@ -95,11 +95,7 @@ int compress_blob_lz4(const void *src, uint64_t src_size, if (src_size < 9) return -ENOBUFS; -#if LZ4_VERSION_NUMBER >= 10700 r = LZ4_compress_default(src, (char*)dst + 8, src_size, (int) dst_alloc_size - 8); -#else - r = LZ4_compress_limitedOutput(src, (char*)dst + 8, src_size, (int) dst_alloc_size - 8); -#endif if (r <= 0) return -ENOBUFS; diff --git a/src/journal/test-compress.c b/src/journal/test-compress.c index 7addf318d6..63c4bf3305 100644 --- a/src/journal/test-compress.c +++ b/src/journal/test-compress.c @@ -208,11 +208,7 @@ static void test_lz4_decompress_partial(void) { memset(huge, 'x', HUGE_SIZE); memcpy(huge, "HUGE=", 5); -#if LZ4_VERSION_NUMBER >= 10700 r = LZ4_compress_default(huge, buf, HUGE_SIZE, buf_size); -#else - r = LZ4_compress_limitedOutput(huge, buf, HUGE_SIZE, buf_size); -#endif assert_se(r >= 0); compressed = r; log_info("Compressed %i → %zu", HUGE_SIZE, compressed); |