diff options
Diffstat (limited to 'app-arch')
| -rw-r--r-- | app-arch/Manifest.gz | bin | 17744 -> 17744 bytes | |||
| -rw-r--r-- | app-arch/libdeflate/Manifest | 7 | ||||
| -rw-r--r-- | app-arch/libdeflate/files/libdeflate-1.19-make-gzip-tests-conditional.patch | 37 | ||||
| -rw-r--r-- | app-arch/libdeflate/libdeflate-1.19.ebuild | 25 | ||||
| -rw-r--r-- | app-arch/libdeflate/libdeflate-9999.ebuild | 25 | ||||
| -rw-r--r-- | app-arch/libdeflate/metadata.xml | 1 |
6 files changed, 84 insertions, 11 deletions
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz Binary files differindex c2da3940b5dc..7aee00c0bacb 100644 --- a/app-arch/Manifest.gz +++ b/app-arch/Manifest.gz diff --git a/app-arch/libdeflate/Manifest b/app-arch/libdeflate/Manifest index 234c91ee4470..c8f4c05b7f4e 100644 --- a/app-arch/libdeflate/Manifest +++ b/app-arch/libdeflate/Manifest @@ -1,4 +1,5 @@ +AUX libdeflate-1.19-make-gzip-tests-conditional.patch 1376 BLAKE2B 9480aed1f1a316899e844f99af988560cd5f07ff98336dbaef63a350ab9a7a76c75c4bf6d8e3709c0e99719dfcd0d3216976a9daab89e2c1277b4a20f036d074 SHA512 469698465c70804b356e628290cc50def2f6281262521b53794f5682c738f9245ec47a36877ebb506e0d070f21fd781478039c32a764d35ffd860ec98b34a30b DIST libdeflate-1.19.tar.gz 187684 BLAKE2B 6d3c58b4095f91f64c25e09a062f1d7e68cd43b4dffc2de6484cd941ede4bffd8a82dd3af08eda6c94ad4120d40809c1d6a1814c28bad5387dfbaad418b93070 SHA512 fe57542a0d28ad61d70bef9b544bb6805f9f30930b16432712b3b1caab041f1f4e64315a4306a0635b96c2632239c5af0e45a3915581d0b89975729fc2e95613 -EBUILD libdeflate-1.19.ebuild 1051 BLAKE2B 50537ae27ed22dfa2140e7e5cb904de0560e7a2bd0d29186aaba6370f7271ebfb0a511ee5de8ac04a61f48a9e4915e06b9b3e5495299d84283393fc4dbb47f05 SHA512 9e41bd3b35f8e20383a9830d4e74f67205c855922a33ba8d67bd20a9e4540b5f7d84ea48d5f294f94811df10ebd45f71a0faf179fc76fce3b3d6d650d8abe0fb -EBUILD libdeflate-9999.ebuild 1051 BLAKE2B 50537ae27ed22dfa2140e7e5cb904de0560e7a2bd0d29186aaba6370f7271ebfb0a511ee5de8ac04a61f48a9e4915e06b9b3e5495299d84283393fc4dbb47f05 SHA512 9e41bd3b35f8e20383a9830d4e74f67205c855922a33ba8d67bd20a9e4540b5f7d84ea48d5f294f94811df10ebd45f71a0faf179fc76fce3b3d6d650d8abe0fb -MISC metadata.xml 691 BLAKE2B dfdca5389e7666068db4f29f1400301509db50d5f93e6dd3912b3b4a034d66715c71fc2921a6448cfd4b7421b1b34a40596096bcef6046977d6685b49ac361c5 SHA512 96f28628ab1fef805c876246b825dd66187974985aad3f492b0f21f719d34ed91d730bae57e978823c8f7ac71c876be756d83bbaa217313dc39e633b41efb4a3 +EBUILD libdeflate-1.19.ebuild 1273 BLAKE2B 4a82b568a26c03fa89ea725550df63782cb8dd22eb880a13e8ff0ded781c1d9e15be4185191d9c6116d29b008196bde790c47f1ec9a1dc3b809ff101b40b4928 SHA512 8c8bda36b893b8ddedabca0dbf7e5aaa9a3a39aa6163ccc61dcc9355e9110b514c5ea64df36ea5e94573f57e0977d4f1a8588444a6c3ca540dbf341d9ed7d5f0 +EBUILD libdeflate-9999.ebuild 1273 BLAKE2B 4a82b568a26c03fa89ea725550df63782cb8dd22eb880a13e8ff0ded781c1d9e15be4185191d9c6116d29b008196bde790c47f1ec9a1dc3b809ff101b40b4928 SHA512 8c8bda36b893b8ddedabca0dbf7e5aaa9a3a39aa6163ccc61dcc9355e9110b514c5ea64df36ea5e94573f57e0977d4f1a8588444a6c3ca540dbf341d9ed7d5f0 +MISC metadata.xml 778 BLAKE2B 91c91f6056ae4d819e47afbf0827a78d03e0d6c9508f7be719f04e1d2b26e62953ee5cf616cfb5f64ecb200a8c308df1bd0f19b020666f3516562311ea028bb6 SHA512 ed0195a5aa10b6ec10852e6b08b2740f513d333a1c458ec051dc30862844f659335c2d7cbe180fee31c24d68660ee4f2fcd182ff7a564f7bc06d48d4e4eb22f5 diff --git a/app-arch/libdeflate/files/libdeflate-1.19-make-gzip-tests-conditional.patch b/app-arch/libdeflate/files/libdeflate-1.19-make-gzip-tests-conditional.patch new file mode 100644 index 000000000000..ae290f3f69d2 --- /dev/null +++ b/app-arch/libdeflate/files/libdeflate-1.19-make-gzip-tests-conditional.patch @@ -0,0 +1,37 @@ +Only build these when the user enables zlib and gzip support +diff --git a/programs/CMakeLists.txt b/programs/CMakeLists.txt +index e707a25..fcfaf12 100644 +--- a/programs/CMakeLists.txt ++++ b/programs/CMakeLists.txt +@@ -80,22 +80,28 @@ if(LIBDEFLATE_BUILD_TESTS) + target_link_libraries(libdeflate_test_utils PUBLIC + libdeflate_prog_utils ZLIB::ZLIB) + ++ if(LIBDEFLATE_GZIP_SUPPORT AND LIBDEFLATE_ZLIB_SUPPORT) + # Build the benchmark and checksum programs. + add_executable(benchmark benchmark.c) + target_link_libraries(benchmark PRIVATE libdeflate_test_utils) + add_executable(checksum checksum.c) + target_link_libraries(checksum PRIVATE libdeflate_test_utils) ++ endif() + + # Build the unit test programs and register them with CTest. + set(UNIT_TEST_PROGS +- test_checksums + test_custom_malloc + test_incomplete_codes + test_invalid_streams + test_litrunlen_overflow + test_overread + test_slow_decompression +- test_trailing_bytes + ) ++ if(LIBDEFLATE_GZIP_SUPPORT AND LIBDEFLATE_ZLIB_SUPPORT) ++ list(APPEND UNIT_TEST_PROGS ++ test_checksums ++ test_trailing_bytes ++ ) ++ endif() + foreach(PROG ${UNIT_TEST_PROGS}) + add_executable(${PROG} ${PROG}.c) + target_link_libraries(${PROG} PRIVATE libdeflate_test_utils) diff --git a/app-arch/libdeflate/libdeflate-1.19.ebuild b/app-arch/libdeflate/libdeflate-1.19.ebuild index ef8f83f51db6..2ed3a652def2 100644 --- a/app-arch/libdeflate/libdeflate-1.19.ebuild +++ b/app-arch/libdeflate/libdeflate-1.19.ebuild @@ -18,14 +18,31 @@ fi LICENSE="MIT" SLOT="0" -IUSE="+gzip static-libs +utils +zlib test" -RESTRICT="!test? ( test )" +# the zlib USE-flag enables support for zlib +# the test USE-flag programs depend on sys-libs/zlib for comparison tests +IUSE="+gzip +utils +zlib test" + +RESTRICT=" + !test? ( test ) +" + +REQUIRED_USE=" + utils? ( gzip ) +" + +DEPEND=" + test? ( sys-libs/zlib ) +" + +PATCHES=( + "${FILESDIR}/${PN}-1.19-make-gzip-tests-conditional.patch" +) src_configure() { local mycmakeargs=( -DLIBDEFLATE_BUILD_SHARED_LIB="yes" - -DLIBDEFLATE_BUILD_STATIC_LIB="$(usex static-libs)" - -DLIBDEFLATE_USE_SHARED_LIB="$(usex !static-libs)" + -DLIBDEFLATE_BUILD_STATIC_LIB="no" + -DLIBDEFLATE_USE_SHARED_LIB="yes" -DLIBDEFLATE_COMPRESSION_SUPPORT="yes" -DLIBDEFLATE_DECOMPRESSION_SUPPORT="yes" diff --git a/app-arch/libdeflate/libdeflate-9999.ebuild b/app-arch/libdeflate/libdeflate-9999.ebuild index ef8f83f51db6..2ed3a652def2 100644 --- a/app-arch/libdeflate/libdeflate-9999.ebuild +++ b/app-arch/libdeflate/libdeflate-9999.ebuild @@ -18,14 +18,31 @@ fi LICENSE="MIT" SLOT="0" -IUSE="+gzip static-libs +utils +zlib test" -RESTRICT="!test? ( test )" +# the zlib USE-flag enables support for zlib +# the test USE-flag programs depend on sys-libs/zlib for comparison tests +IUSE="+gzip +utils +zlib test" + +RESTRICT=" + !test? ( test ) +" + +REQUIRED_USE=" + utils? ( gzip ) +" + +DEPEND=" + test? ( sys-libs/zlib ) +" + +PATCHES=( + "${FILESDIR}/${PN}-1.19-make-gzip-tests-conditional.patch" +) src_configure() { local mycmakeargs=( -DLIBDEFLATE_BUILD_SHARED_LIB="yes" - -DLIBDEFLATE_BUILD_STATIC_LIB="$(usex static-libs)" - -DLIBDEFLATE_USE_SHARED_LIB="$(usex !static-libs)" + -DLIBDEFLATE_BUILD_STATIC_LIB="no" + -DLIBDEFLATE_USE_SHARED_LIB="yes" -DLIBDEFLATE_COMPRESSION_SUPPORT="yes" -DLIBDEFLATE_DECOMPRESSION_SUPPORT="yes" diff --git a/app-arch/libdeflate/metadata.xml b/app-arch/libdeflate/metadata.xml index e81e4a11f128..17956aa98f85 100644 --- a/app-arch/libdeflate/metadata.xml +++ b/app-arch/libdeflate/metadata.xml @@ -12,6 +12,7 @@ </maintainer> <use> <flag name="gzip">Support the gzip format</flag> + <flag name="test">Build the test programs (requires <pkg>sys-libs/zlib</pkg>)</flag> <flag name="utils">Build the libdeflate-gzip program</flag> <flag name="zlib">Support the zlib format</flag> </use> |