diff options
| author | Stephen Webb <swebb2066@gmail.com> | 2020-10-07 09:00:58 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-06 15:00:58 -0700 |
| commit | 41ec19fa8a61483469dde7e51282e64b42aa1a4e (patch) | |
| tree | 93893ed7f9bc4bcf46635bd22ebcdce39dd0219d /ports/log4cxx/linux.patch | |
| parent | 524a7c61f3d3f3df569f134ebe9745ad64a730dc (diff) | |
| download | vcpkg-41ec19fa8a61483469dde7e51282e64b42aa1a4e.tar.gz vcpkg-41ec19fa8a61483469dde7e51282e64b42aa1a4e.zip | |
[log4cxx] Upgrade to 0.11.0 (#13767)
* [log4cxx] Upgrade to newly released 0.11.0
* [log4cxx] 0.11.0 should build everywhere except uwp
* Changes suggested by @ras0219
* Prevent WIN32 libraries being used on linux
* Prevent WIN32 libraries being used on linux
* Prevent WIN32 libraries being used on linux
* Update ports/log4cxx/portfile.cmake
Co-authored-by: Stephen Webb <stephen.webb@sabreautonomous.com.au>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Diffstat (limited to 'ports/log4cxx/linux.patch')
| -rw-r--r-- | ports/log4cxx/linux.patch | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/ports/log4cxx/linux.patch b/ports/log4cxx/linux.patch new file mode 100644 index 000000000..01c51c218 --- /dev/null +++ b/ports/log4cxx/linux.patch @@ -0,0 +1,17 @@ +diff --git a/src/cmake/FindAPR.cmake b/src/cmake/FindAPR.cmake +index a204ece..4d2b48d 100644 +--- a/src/cmake/FindAPR.cmake ++++ b/src/cmake/FindAPR.cmake +@@ -45,7 +45,11 @@ if(EXISTS ${APR_CONFIG_EXECUTABLE}) + else() + find_path(APR_INCLUDE_DIR apr.h PATH_SUFFIXES apr-1) + if (APR_STATIC OR NOT BUILD_SHARED_LIBS) +- set(APR_SYSTEM_LIBS ws2_32 mswsock rpcrt4) ++ if(WIN32) ++ set(APR_SYSTEM_LIBS ws2_32 mswsock rpcrt4) ++ else() ++ set(APR_SYSTEM_LIBS pthread) ++ endif() + set(APR_COMPILE_DEFINITIONS APR_DECLARE_STATIC) + find_library(APR_LIBRARIES NAMES apr-1) + else() |