diff options
| author | Wolfgang Stöggl <c72578@yahoo.de> | 2021-08-10 09:57:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-10 00:57:48 -0700 |
| commit | 32f6448a9ea511ab33d02571917b9dd3cae578e2 (patch) | |
| tree | ea5ef224a340bf63b3d44400fd931d32c02bda78 /ports/libarchive/fix-buildsystem.patch | |
| parent | dd462392f4651dcbce3051225a20b161035bef5e (diff) | |
| download | vcpkg-32f6448a9ea511ab33d02571917b9dd3cae578e2.tar.gz vcpkg-32f6448a9ea511ab33d02571917b9dd3cae578e2.zip | |
[libarchive] Restore pkgconfig file (#19428)
So far, generating libarchive.pc has been disabled by the
fix-buildsystem.patch, whereas INCLUDE(CreatePkgConfigFile) has
been removed from CMakeLists.txt
- Update fix-buildsystem.patch and allow creating the pkgconfig file
- Add vcpkg_fixup_pkgconfig() to portfile
- Add `FEATURES` keyword to vcpkg_check_features() to avoid deprecation
warning
Diffstat (limited to 'ports/libarchive/fix-buildsystem.patch')
| -rw-r--r-- | ports/libarchive/fix-buildsystem.patch | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/ports/libarchive/fix-buildsystem.patch b/ports/libarchive/fix-buildsystem.patch index 9ed57f6f1..4aa19738a 100644 --- a/ports/libarchive/fix-buildsystem.patch +++ b/ports/libarchive/fix-buildsystem.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b2634da..6a1dc1f 100644
+index b2634da6..0d846877 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -148,10 +148,6 @@ IF (CMAKE_C_COMPILER_ID MATCHES "^XL$")
@@ -34,7 +34,7 @@ index b2634da..6a1dc1f 100644 - RUNS
- "#include <zlib.h>\nint main() {uLong f = zlibCompileFlags(); return (f&(1U<<10))?0:-1; }"
- ZLIB_WINAPI)
-+ SET(ZLIB_WINAPI OFF) # skip following test, it crashes with weird message box
++ SET(ZLIB_WINAPI OFF) # skip following test, it crashes with weird message box
IF(ZLIB_WINAPI)
ADD_DEFINITIONS(-DZLIB_WINAPI)
ELSE(ZLIB_WINAPI)
@@ -106,13 +106,7 @@ index b2634da..6a1dc1f 100644 IF(HAVE_STRERROR_R)
SET(HAVE_DECL_STRERROR_R 1)
-@@ -2012,13 +2001,10 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/build/cmake/config.h.in
- INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
- ADD_DEFINITIONS(-DHAVE_CONFIG_H)
-
--# Handle generation of the libarchive.pc file for pkg-config
--INCLUDE(CreatePkgConfigFile)
--
+@@ -2018,7 +2007,7 @@ INCLUDE(CreatePkgConfigFile)
#
# Register installation of PDF documents.
#
@@ -122,7 +116,7 @@ index b2634da..6a1dc1f 100644 # On Windows platform, It's better that we install PDF documents
# on one's computer.
diff --git a/libarchive/CMakeLists.txt b/libarchive/CMakeLists.txt
-index 9389bbc..0793d96 100644
+index 9389bbc9..c34a42b2 100644
--- a/libarchive/CMakeLists.txt
+++ b/libarchive/CMakeLists.txt
@@ -236,28 +236,22 @@ ELSEIF(ARCHIVE_ACL_SUNOS)
@@ -153,7 +147,7 @@ index 9389bbc..0793d96 100644 IF(ENABLE_INSTALL)
# How to install the libraries
- INSTALL(TARGETS archive archive_static
-+ INSTALL(TARGETS archive
++ INSTALL(TARGETS archive
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib)
|