diff --git a/README b/README index a3cfcada77..4439be11f0 100644 --- a/README +++ b/README @@ -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);