diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2021-01-22 23:11:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-22 14:11:20 -0800 |
| commit | 57465e9bfc916132ca4cd03adb978d62b445238b (patch) | |
| tree | a814ac782107071e8fe60de2138cccf1aa377bc6 | |
| parent | a66c5ec3859cf2f619fd41fb42389859f7edc848 (diff) | |
| download | vcpkg-57465e9bfc916132ca4cd03adb978d62b445238b.tar.gz vcpkg-57465e9bfc916132ca4cd03adb978d62b445238b.zip | |
[lzo] Install pc file on windows (#15782)
* [lzo] Install pc file on windows
* add version info
* [lzo] Install pc file on windows
* add version info
| -rw-r--r-- | ports/lzo/CONTROL | 3 | ||||
| -rw-r--r-- | ports/lzo/always_install_pc.patch | 13 | ||||
| -rw-r--r-- | ports/lzo/portfile.cmake | 2 | ||||
| -rw-r--r-- | versions/baseline.json | 4 | ||||
| -rw-r--r-- | versions/l-/lzo.json | 5 |
5 files changed, 24 insertions, 3 deletions
diff --git a/ports/lzo/CONTROL b/ports/lzo/CONTROL index 4548ae9bb..fa904083a 100644 --- a/ports/lzo/CONTROL +++ b/ports/lzo/CONTROL @@ -1,4 +1,5 @@ Source: lzo -Version: 2.10-5 +Version: 2.10 +Port-Version: 6 Homepage: https://www.oberhumer.com/opensource/lzo/ Description: Lossless data compression library diff --git a/ports/lzo/always_install_pc.patch b/ports/lzo/always_install_pc.patch new file mode 100644 index 000000000..6750eb681 --- /dev/null +++ b/ports/lzo/always_install_pc.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 98c0a1ad0..85690209c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -290,7 +290,7 @@ if(1) + install(TARGETS ${f} DESTINATION "${CMAKE_INSTALL_FULL_LIBEXECDIR}/lzo/examples") + endif() + +-if(PKG_CONFIG_FOUND) ++if(1) + configure_file(lzo2.pc.cmakein lzo2.pc @ONLY) + #if(EXISTS "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig") + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/lzo2.pc" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig") diff --git a/ports/lzo/portfile.cmake b/ports/lzo/portfile.cmake index 7c09aaf0c..514c8555a 100644 --- a/ports/lzo/portfile.cmake +++ b/ports/lzo/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} + PATCHES always_install_pc.patch ) set(LZO_STATIC OFF) @@ -26,6 +27,7 @@ vcpkg_configure_cmake( ) vcpkg_install_cmake() +vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/doc) diff --git a/versions/baseline.json b/versions/baseline.json index c6a99c7cb..db198be6f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3589,8 +3589,8 @@ "port-version": 0 }, "lzo": { - "baseline": "2.10-5", - "port-version": 0 + "baseline": "2.10", + "port-version": 6 }, "lzokay": { "baseline": "2020-07-30", diff --git a/versions/l-/lzo.json b/versions/l-/lzo.json index a85e56424..186064c9b 100644 --- a/versions/l-/lzo.json +++ b/versions/l-/lzo.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "0386bfc83656abde700f2f99732a92e7fd6ac756", + "version-string": "2.10", + "port-version": 6 + }, + { "git-tree": "7d19bc8d305faffeba8990d9e6c095ee95b3108d", "version-string": "2.10-5", "port-version": 0 |