Global
/
vcpkg
mirror of https://github.com/microsoft/vcpkg.git
1
0
Fork 0
Code Activity

[libarchive] update to 3.5.2 (#16845) 

* libarchive 3.5.1

attempt to create package - error on libiconv.

* update sha based on build error

* Turn off the CMAKE_USE_SYSTEM_LIBARCHIVE option

* remove unused patches

* remove empty patches

* Update scripts/test_ports/cmake/portfile.cmake

Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>

* revisit control file -> vcpkg.json

* recover patch files

* remove port version per auto-review

* restore INCLUDE(CreatePkgConfigFile)

* update git-tree after merge

* patches not referenced #facepalm

* Update libarchive.json

* added missing FEATURES keyword

* update git-tree + merge fix

* Update libarchive.json

* Update libarchive.json

* Update libarchive.json

* libarchive 3.5.2

* formatting + git-tree

* Update libarchive.json

* should not remove wrapper ?

* Update libarchive.json

* revert patch original EOF

* update version

Co-authored-by: Jonliu1993 <13720414433@163.com>
Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>
Co-authored-by: Seika <seika@machinex.ca>
This commit is contained in:
Matthieu Penant 2021-09-13 17:39:54 -04:00 committed by GitHub
parent 86db69b341
commit 92f6e66a61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ports/libarchive/portfile.cmake
View File

@ -3,14 +3,14 @@ vcpkg_fail_port_install(ON_TARGET "UWP")
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO libarchive/libarchive
REF fc6563f5130d8a7ee1fc27c0e55baef35119f26c #v3.4.3
SHA512 54ca4f3cc3b38dcf6588b2369ce43109c4a57a04061348ab8bf046c5c13ace0c4f42c9f3961288542cb5fe12c05359d572b39fe7cec32a10151dbac78e8a3707
REF 1b2c437b99b361c7692538fa373e99955e9b93ae #v3.5.2
SHA512 df527dd333b01ed85f07831ba0bd4b1d0b5384fe12cfa53474ad39c04509105a3c8574a2d21a430e3584a931c8f6ae923bca95df83945f0c593c1ffaed3f62da
HEAD_REF master
PATCHES
fix-buildsystem.patch
fix-dependencies.patch
fix-cpu-set.patch
PATCHES
disable-warnings.patch
fix-buildsystem.patch
fix-cpu-set.patch
fix-dependencies.patch
)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@ -77,6 +77,10 @@ configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in" "${CURRE
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
endif()
foreach(HEADER ${CURRENT_PACKAGES_DIR}/include/archive.h ${CURRENT_PACKAGES_DIR}/include/archive_entry.h)
file(READ ${HEADER} CONTENTS)
string(REPLACE "(!defined LIBARCHIVE_STATIC)" "0" CONTENTS "${CONTENTS}")

3
ports/libarchive/vcpkg.json
View File

@ -1,7 +1,6 @@
{
"name": "libarchive",
"version-semver": "3.4.3",
"port-version": 8,
"version-semver": "3.5.2",
"description": "Library for reading and writing streaming archives",
"homepage": "https://github.com/libarchive/libarchive",
"supports": "!uwp",

4
versions/baseline.json
View File

@ -3125,8 +3125,8 @@
"port-version": 7
},
"libarchive": {
"baseline": "3.4.3",
"port-version": 8
"baseline": "3.5.2",
"port-version": 0
},
"libass": {
"baseline": "0.15.1",

5
versions/l-/libarchive.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "4ce798873a82e4562c34189ec77f1dec3dea047d",
"version-semver": "3.5.2",
"port-version": 0
},
{
"git-tree": "576d8d60f06c8b4c616fd55559f3da94b9a8ae27",
"version-semver": "3.4.3",