diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-02-05 18:44:56 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-02-05 18:44:56 +0000 |
commit | 29aabba0ea759c6a2864ff5631735b67ee38e5e0 (patch) | |
tree | ab466b4dfa7abecb401b2f8039d08af4689306bb /dev-libs/libzip/files | |
parent | d42200bec37eef2a7478d88988ff00addd0a9202 (diff) |
gentoo resync : 05.02.2020
Diffstat (limited to 'dev-libs/libzip/files')
-rw-r--r-- | dev-libs/libzip/files/libzip-1.5.1-bzip2.patch | 53 | ||||
-rw-r--r-- | dev-libs/libzip/files/libzip-1.5.1-options.patch | 50 |
2 files changed, 0 insertions, 103 deletions
diff --git a/dev-libs/libzip/files/libzip-1.5.1-bzip2.patch b/dev-libs/libzip/files/libzip-1.5.1-bzip2.patch deleted file mode 100644 index 9b70eaca8e87..000000000000 --- a/dev-libs/libzip/files/libzip-1.5.1-bzip2.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 028c492c9d45ca29e2fbec79a203ba492016f15e Mon Sep 17 00:00:00 2001 -From: Miklos Vajna <vmiklos@collabora.co.uk> -Date: Fri, 7 Sep 2018 23:12:36 +0200 -Subject: [PATCH] Add an option to disable bzip2 support - -The explicit switch is still on by default, but this way it's possible -to explicitly disable bzip2 support even if bzip2 is available on the -system. - -This is useful if bzip2 is not needed, but would automatically lead to -an unwanted dependency. ---- - CMakeLists.txt | 19 +++++++++++-------- - 1 file changed, 11 insertions(+), 8 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 73a34855..879e0f21 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -10,6 +10,7 @@ PROJECT(libzip C) - OPTION(ENABLE_GNUTLS "Enable use of GnuTLS" ON) - OPTION(ENABLE_OPENSSL "Enable use of OpenSSL" ON) - OPTION(ENABLE_COMMONCRYPTO "Enable use of CommonCrypto" ON) -+OPTION(ENABLE_BZIP2 "Enable use of BZip2" ON) - - OPTION(BUILD_TOOLS "Build tools in the src directory (zipcmp, zipmerge, ziptool)" ON) - OPTION(BUILD_REGRESS "Build regression tests" ON) -@@ -186,15 +187,17 @@ IF(ZLIB_VERSION_STRING VERSION_LESS "1.1.2") - MESSAGE(FATAL_ERROR "-- ZLIB version too old, please install at least v1.1.2") - ENDIF(ZLIB_VERSION_STRING VERSION_LESS "1.1.2") - --FIND_PACKAGE(BZip2) --IF(BZIP2_FOUND) -- SET (HAVE_LIBBZ2 1) -+IF(ENABLE_BZIP2) -+ FIND_PACKAGE(BZip2) -+ IF(BZIP2_FOUND) -+ SET (HAVE_LIBBZ2 1) - -- INCLUDE_DIRECTORIES(${BZIP2_INCLUDE_DIR}) -- SET (OPTIONAL_LIBRARY ${BZIP2_LIBRARY}) --ELSE() -- MESSAGE(WARNING "-- bzip2 library not found; bzip2 support disabled") --ENDIF(BZIP2_FOUND) -+ INCLUDE_DIRECTORIES(${BZIP2_INCLUDE_DIR}) -+ SET (OPTIONAL_LIBRARY ${BZIP2_LIBRARY}) -+ ELSE() -+ MESSAGE(WARNING "-- bzip2 library not found; bzip2 support disabled") -+ ENDIF(BZIP2_FOUND) -+ENDIF(ENABLE_BZIP2) - - IF (COMMONCRYPTO_FOUND) - SET (HAVE_CRYPTO 1) diff --git a/dev-libs/libzip/files/libzip-1.5.1-options.patch b/dev-libs/libzip/files/libzip-1.5.1-options.patch deleted file mode 100644 index 0cca187d90a0..000000000000 --- a/dev-libs/libzip/files/libzip-1.5.1-options.patch +++ /dev/null @@ -1,50 +0,0 @@ -From b6e53cce5370fba88299f9ed2944ab8a7a4cef5c Mon Sep 17 00:00:00 2001 -From: Florian Delizy <florian.delizy@gmail.com> -Date: Tue, 7 Aug 2018 22:09:32 +0800 -Subject: [PATCH] adding BUILD_TOOLS BUILD_REGRESS BUILD_EXAMPLES BUILD_DOC - options (default ON) - ---- - CMakeLists.txt | 18 ++++++++++++++++++ - 1 file changed, 18 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 69e6548e..def25607 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -11,6 +11,11 @@ OPTION(ENABLE_GNUTLS "Enable use of GnuTLS" ON) - OPTION(ENABLE_OPENSSL "Enable use of OpenSSL" ON) - OPTION(ENABLE_COMMONCRYPTO "Enable use of CommonCrypto" ON) - -+OPTION(BUILD_TOOLS "Build tools in the src directory (zipcmp, zipmerge, ziptool)" ON) -+OPTION(BUILD_REGRESS "Build regression tests" ON) -+OPTION(BUILD_EXAMPLES "Build examples" ON) -+OPTION(BUILD_DOC "Build documentation" ON) -+ - INCLUDE(CheckFunctionExists) - INCLUDE(CheckIncludeFiles) - INCLUDE(CheckSymbolExists) -@@ -234,10 +239,23 @@ ENABLE_TESTING() - - # Targets - ADD_SUBDIRECTORY(lib) -+ -+IF(BUILD_DOC) - ADD_SUBDIRECTORY(man) -+ENDIF() -+ -+IF(BUILD_TOOLS) - ADD_SUBDIRECTORY(src) -+ENDIF() -+ -+IF(BUILD_REGRESS) - ADD_SUBDIRECTORY(regress) -+ENDIF() -+ -+IF(BUILD_EXAMPLES) - ADD_SUBDIRECTORY(examples) -+ENDIF() -+ - - # pkgconfig file - SET(prefix ${CMAKE_INSTALL_PREFIX}) |