All of lore.kernel.org
 help / color / mirror / Atom feed
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 1/1] package/minizip: use pkg-config to find zstd
Date: Thu, 23 Jul 2020 22:51:35 +0200	[thread overview]
Message-ID: <20200723205135.55024-1-fontaine.fabrice@gmail.com> (raw)

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

             reply	other threads:[~2020-07-23 20:51 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-23 20:51 Fabrice Fontaine [this message]
2020-07-25 21:22 ` [Buildroot] [PATCH 1/1] package/minizip: use pkg-config to find zstd Thomas Petazzoni

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200723205135.55024-1-fontaine.fabrice@gmail.com \
    --to=fontaine.fabrice@gmail.com \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.