[Buildroot] [PATCH 1/1] package/minizip: use pkg-config to find zstd

* [Buildroot] [PATCH 1/1] package/minizip: use pkg-config to find zstd
@ 2020-07-23 20:51 Fabrice Fontaine
  2020-07-25 21:22 ` Thomas Petazzoni
  0 siblings, 1 reply; 2+ messages in thread
From: Fabrice Fontaine @ 2020-07-23 20:51 UTC (permalink / raw)
  To: buildroot

Fix build with zstd in version 2.10.0

Fixes:
 - http://autobuild.buildroot.org/results/0fe0ca0a7d39f863614f2aecd9eefc20cd64daf4

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 .../0001-Use-pkg-config-to-find-ZSTD.patch    | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 package/minizip/0001-Use-pkg-config-to-find-ZSTD.patch

diff --git a/package/minizip/0001-Use-pkg-config-to-find-ZSTD.patch b/package/minizip/0001-Use-pkg-config-to-find-ZSTD.patch
new file mode 100644
index 0000000000..5866099634
--- /dev/null
+++ b/package/minizip/0001-Use-pkg-config-to-find-ZSTD.patch
@@ -0,0 +1,30 @@
+From 69afd09aee3727f2804e1b063ef50800b22c6bb9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Patrik=20Novotn=C3=BD?= <panovotn@redhat.com>
+Date: Wed, 1 Jul 2020 11:18:08 +0200
+Subject: [PATCH] Use pkg-config to find ZSTD
+
+[Retrieved from: https://github.com/nmoinvaz/minizip/pull/509]
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+---
+ CMakeLists.txt | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a6deb4ce..987e7947 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -115,7 +115,13 @@ endif()
+ # Check if zstd installation is present
+ if(MZ_ZSTD)
+     if(NOT ZSTD_FORCE_FETCH)
+-        find_package(ZSTD QUIET)
++        find_package(PkgConfig)
++        if(PKGCONFIG_FOUND)
++            pkg_check_modules(ZSTD libzstd)
++        endif()
++        if(NOT ZSTD_FOUND)
++            find_package(ZSTD QUIET)
++        endif()
+     endif()
+     if(ZSTD_FOUND AND NOT ZSTD_FORCE_FETCH)
+         message(STATUS "Using ZSTD")
-- 
2.27.0

^ permalink raw reply related	[flat|nested] 2+ messages in thread