Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed pkgconfig files (mostly on Windows) #37

Merged
merged 1 commit into from
Sep 2, 2023
Merged

Fixed pkgconfig files (mostly on Windows) #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions recipe/fix-zstd-pkgconfig.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
From c719428916b4d19e838f873b1a177b126a080d61 Mon Sep 17 00:00:00 2001
From: Thomas Klausner <[email protected]>
Date: Thu, 24 Aug 2023 14:07:50 +0200
Subject: [PATCH] Check for zstd_TARGET before using it in a regex.

Closes #404.
---
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b2e77241..b7bb7e3f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -349,7 +349,7 @@ endforeach()
STRING(CONCAT zlib_link_name "-l" ${ZLIB_LINK_LIBRARY_NAME})
string(REGEX REPLACE "-lBZip2::BZip2" "-lbz2" LIBS ${LIBS})
string(REGEX REPLACE "-lLibLZMA::LibLZMA" "-llzma" LIBS ${LIBS})
-if(ENABLE_ZSTD)
+if(zstd_TARGET)
string(REGEX REPLACE "-l${zstd_TARGET}" "-lzstd" LIBS ${LIBS})
endif()
string(REGEX REPLACE "-lOpenSSL::Crypto" "-lssl -lcrypto" LIBS ${LIBS})
3 changes: 2 additions & 1 deletion recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@ source:
sha256: {{ sha256 }}
patches:
- fix-bz2-pkgconfig-win.patch # [win]
- fix-zstd-pkgconfig.patch

build:
number: 0
number: 1
run_exports:
- {{ pin_subpackage(name, max_pin='x') }}

Expand Down