From 77b4e50e1cb1b46b85c595b4ae7456dac8440f92 Mon Sep 17 00:00:00 2001 From: toge Date: Wed, 25 Oct 2023 02:48:22 +0900 Subject: [PATCH] (#20708) c-bllosc2: update zlib-ng, fix compilation errors with with_zlib=zlib-ng --- recipes/c-blosc2/all/conanfile.py | 2 +- .../all/patches/2.10.0-0001-fix-cmake.patch | 10 +++++----- .../all/patches/2.10.2-0001-fix-cmake.patch | 10 +++++----- .../all/patches/2.10.5-0001-fix-cmake.patch | 10 +++++----- .../all/patches/2.8.0-0001-fix-cmake.patch | 14 +++++++------- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/recipes/c-blosc2/all/conanfile.py b/recipes/c-blosc2/all/conanfile.py index e0435a75fa522..0c8d3e2c2406f 100644 --- a/recipes/c-blosc2/all/conanfile.py +++ b/recipes/c-blosc2/all/conanfile.py @@ -67,7 +67,7 @@ def requirements(self): if self.options.with_lz4: self.requires("lz4/1.9.4") if self.options.with_zlib in ["zlib-ng", "zlib-ng-compat"]: - self.requires("zlib-ng/2.1.3") + self.requires("zlib-ng/2.1.4") elif self.options.with_zlib == "zlib": self.requires("zlib/[>=1.2.11 <2]") if self.options.with_zstd: diff --git a/recipes/c-blosc2/all/patches/2.10.0-0001-fix-cmake.patch b/recipes/c-blosc2/all/patches/2.10.0-0001-fix-cmake.patch index 4ccea534729cb..17ad6d731a77c 100644 --- a/recipes/c-blosc2/all/patches/2.10.0-0001-fix-cmake.patch +++ b/recipes/c-blosc2/all/patches/2.10.0-0001-fix-cmake.patch @@ -16,15 +16,15 @@ index 85d1e03..00e6cad 100644 if(PREFER_EXTERNAL_ZLIB) - find_package(ZLIB_NG) - if(ZLIB_NG_FOUND) -+ find_package(zlib_ng) -+ if(zlib_ng_FOUND) ++ find_package(zlib-ng) ++ if(zlib-ng_FOUND) set(HAVE_ZLIB_NG TRUE) else() find_package(ZLIB) endif() - if(NOT (ZLIB_NG_FOUND OR ZLIB_FOUND)) -+ if(NOT (zlib_ng_FOUND OR ZLIB_FOUND)) ++ if(NOT (zlib-ng_FOUND OR ZLIB_FOUND)) message(STATUS "No ZLIB found. Using ZLIB-NG internal sources.") endif() endif() @@ -88,8 +88,8 @@ index a6d566d..ba65bae 100644 if(NOT DEACTIVATE_ZLIB) - if(ZLIB_NG_FOUND) - set(LIBS ${LIBS} ${ZLIB_NG_LIBRARY}) -+ if(zlib_ng_FOUND) -+ set(LIBS ${LIBS} ${zlib_ng_LIBRARIES}) ++ if(zlib-ng_FOUND) ++ set(LIBS ${LIBS} ${zlib-ng_LIBRARIES}) elseif(ZLIB_FOUND) set(LIBS ${LIBS} ${ZLIB_LIBRARIES}) else() diff --git a/recipes/c-blosc2/all/patches/2.10.2-0001-fix-cmake.patch b/recipes/c-blosc2/all/patches/2.10.2-0001-fix-cmake.patch index b530262f17fda..fb1f3b574be59 100644 --- a/recipes/c-blosc2/all/patches/2.10.2-0001-fix-cmake.patch +++ b/recipes/c-blosc2/all/patches/2.10.2-0001-fix-cmake.patch @@ -16,15 +16,15 @@ index 4b4fc6a..79d61da 100644 if(PREFER_EXTERNAL_ZLIB) - find_package(ZLIB_NG) - if(ZLIB_NG_FOUND) -+ find_package(zlib_ng) -+ if(zlib_ng_FOUND) ++ find_package(zlib-ng) ++ if(zlib-ng_FOUND) set(HAVE_ZLIB_NG TRUE) else() find_package(ZLIB) endif() - if(NOT (ZLIB_NG_FOUND OR ZLIB_FOUND)) -+ if(NOT (zlib_ng_FOUND OR ZLIB_FOUND)) ++ if(NOT (zlib-ng_FOUND OR ZLIB_FOUND)) message(STATUS "No ZLIB found. Using ZLIB-NG internal sources.") endif() endif() @@ -112,8 +112,8 @@ index b44b710..681705e 100644 if(NOT DEACTIVATE_ZLIB) - if(ZLIB_NG_FOUND) - set(LIBS ${LIBS} ${ZLIB_NG_LIBRARY}) -+ if(zlib_ng_FOUND) -+ set(LIBS ${LIBS} ${zlib_ng_LIBRARIES}) ++ if(zlib-ng_FOUND) ++ set(LIBS ${LIBS} ${zlib-ng_LIBRARIES}) elseif(ZLIB_FOUND) set(LIBS ${LIBS} ${ZLIB_LIBRARIES}) else() diff --git a/recipes/c-blosc2/all/patches/2.10.5-0001-fix-cmake.patch b/recipes/c-blosc2/all/patches/2.10.5-0001-fix-cmake.patch index 389b3c771ae6e..743a69c503d24 100644 --- a/recipes/c-blosc2/all/patches/2.10.5-0001-fix-cmake.patch +++ b/recipes/c-blosc2/all/patches/2.10.5-0001-fix-cmake.patch @@ -16,15 +16,15 @@ index 19e203a..aa6ccdd 100644 if(PREFER_EXTERNAL_ZLIB) - find_package(ZLIB_NG) - if(ZLIB_NG_FOUND) -+ find_package(zlib_ng) -+ if(zlib_ng_FOUND) ++ find_package(zlib-ng) ++ if(zlib-ng_FOUND) set(HAVE_ZLIB_NG TRUE) else() find_package(ZLIB) endif() - if(NOT (ZLIB_NG_FOUND OR ZLIB_FOUND)) -+ if(NOT (zlib_ng_FOUND OR ZLIB_FOUND)) ++ if(NOT (zlib-ng_FOUND OR ZLIB_FOUND)) message(STATUS "No ZLIB found. Using ZLIB-NG internal sources.") endif() endif() @@ -111,8 +111,8 @@ index 8c7cf90..f7efbf5 100644 if(NOT DEACTIVATE_ZLIB) - if(ZLIB_NG_FOUND) - set(LIBS ${LIBS} ${ZLIB_NG_LIBRARY}) -+ if(zlib_ng_FOUND) -+ set(LIBS ${LIBS} ${zlib_ng_LIBRARIES}) ++ if(zlib-ng_FOUND) ++ set(LIBS ${LIBS} ${zlib-ng_LIBRARIES}) elseif(ZLIB_FOUND) set(LIBS ${LIBS} ${ZLIB_LIBRARIES}) else() diff --git a/recipes/c-blosc2/all/patches/2.8.0-0001-fix-cmake.patch b/recipes/c-blosc2/all/patches/2.8.0-0001-fix-cmake.patch index 4ca392bba22b4..a0812cb90ffab 100644 --- a/recipes/c-blosc2/all/patches/2.8.0-0001-fix-cmake.patch +++ b/recipes/c-blosc2/all/patches/2.8.0-0001-fix-cmake.patch @@ -16,15 +16,15 @@ index bb7882f..92ac61c 100644 if(PREFER_EXTERNAL_ZLIB) - find_package(ZLIB_NG) - if(ZLIB_NG_FOUND) -+ find_package(zlib_ng) -+ if(zlib_ng_FOUND) ++ find_package(zlib-ng) ++ if(zlib-ng_FOUND) set(HAVE_ZLIB_NG TRUE) else() find_package(ZLIB) endif() - if(NOT (ZLIB_NG_FOUND OR ZLIB_FOUND)) -+ if(NOT (zlib_ng_FOUND OR ZLIB_FOUND)) ++ if(NOT (zlib-ng_FOUND OR ZLIB_FOUND)) message(STATUS "No ZLIB found. Using ZLIB-NG internal sources.") endif() endif() @@ -65,8 +65,8 @@ index 365de33..74ed32e 100644 if(NOT DEACTIVATE_ZLIB) - if(ZLIB_NG_FOUND) - set(BLOSC_INCLUDE_DIRS ${BLOSC_INCLUDE_DIRS} ${ZLIB_NG_INCLUDE_DIR}) -+ if(zlib_ng_FOUND) -+ set(BLOSC_INCLUDE_DIRS ${BLOSC_INCLUDE_DIRS} ${zlib_ng_INCLUDE_DIR}) ++ if(zlib-ng_FOUND) ++ set(BLOSC_INCLUDE_DIRS ${BLOSC_INCLUDE_DIRS} ${zlib-ng_INCLUDE_DIR}) elseif(ZLIB_FOUND) set(BLOSC_INCLUDE_DIRS ${BLOSC_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR}) else() @@ -98,8 +98,8 @@ index 365de33..74ed32e 100644 if(NOT DEACTIVATE_ZLIB) - if(ZLIB_NG_FOUND) - set(LIBS ${LIBS} ${ZLIB_NG_LIBRARY}) -+ if(zlib_ng_FOUND) -+ set(LIBS ${LIBS} ${zlib_ng_LIBRARY}) ++ if(zlib-ng_FOUND) ++ set(LIBS ${LIBS} ${zlib-ng_LIBRARY}) elseif(ZLIB_FOUND) - set(LIBS ${LIBS} ${ZLIB_LIBRARY}) + set(LIBS ${LIBS} ${ZLIB_LIBRARIES})