-
-
Notifications
You must be signed in to change notification settings - Fork 15k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix poco build to actually use the nix provided dependencies, and fix…
… the static build that broke as fallout from that
- Loading branch information
Showing
2 changed files
with
34 additions
and
2 deletions.
There are no files selected for viewing
23 changes: 23 additions & 0 deletions
23
pkgs/by-name/po/poco/disable-internal-pcre-files-for-non-static-builds.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
diff --git a/Foundation/CMakeLists.txt b/Foundation/CMakeLists.txt | ||
index d5f3b267d..dfaf99a10 100644 | ||
--- a/Foundation/CMakeLists.txt | ||
+++ b/Foundation/CMakeLists.txt | ||
@@ -31,11 +31,13 @@ if(POCO_UNBUNDLED) | ||
find_package(ZLIB REQUIRED) | ||
find_package(Utf8Proc REQUIRED) | ||
|
||
- #HACK: Unicode.cpp requires functions from these files. The can't be taken from the library | ||
- POCO_SOURCES(SRCS RegExp | ||
- src/pcre2_ucd.c | ||
- src/pcre2_tables.c | ||
- ) | ||
+ if(NOT POCO_STATIC AND BUILD_SHARED_LIBS) | ||
+ #HACK: Unicode.cpp requires functions from these files. The can't be taken from the library | ||
+ POCO_SOURCES(SRCS RegExp | ||
+ src/pcre2_ucd.c | ||
+ src/pcre2_tables.c | ||
+ ) | ||
+ endif() | ||
|
||
else() | ||
# pcre2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters