mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-28 03:09:02 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[expat] Update to 2.4.1 (#17856)

Browse Source 
* [expat] Update to 2.3.0

* update version

* [expat] Update to 2.4.1

* update version

* add pkgconfig.patch

* update version

* revert pkgconfig.patch

* update version

* revert patch format

* update version
This commit is contained in:
JonLiu1993 2021-06-11 23:48:00 +08:00 committed by GitHub
parent 1d8133122b
commit 3a98608b80
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ports/expat/CONTROL
View File

@ -1,4 +0,0 @@
Source: expat
Version: 2020-08-18
Homepage: https://github.com/libexpat/libexpat
Description: XML parser library written in C

8
ports/expat/pkgconfig.patch
View File

@ -1,15 +1,13 @@
diff --git a/expat/CMakeLists.txt b/expat/CMakeLists.txt
index a67f081b1..cc220f2a1 100644
index cd12a99..03c2c4d 100644
--- a/expat/CMakeLists.txt
+++ b/expat/CMakeLists.txt
@@ -294,7 +294,9 @@ expat_install(FILES lib/expat.h lib/expat_external.h DESTINATION ${CMAKE_INSTALL
@@ -419,6 +419,8 @@ expat_install(FILES lib/expat.h lib/expat_external.h DESTINATION ${CMAKE_INSTALL
#
# pkg-config file
#
+string(TOUPPER "${CMAKE_BUILD_TYPE}" BUILD_TYPE_UPPER)
+set(_EXPAT_OUTPUT_NAME ${_EXPAT_OUTPUT_NAME}${CMAKE_${BUILD_TYPE_UPPER}_POSTFIX})
-if(NOT MSVC)
+if(1)
if(EXPAT_BUILD_PKGCONFIG)
set(prefix ${CMAKE_INSTALL_PREFIX})
set(exec_prefix "\${prefix}")
set(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}")

9
ports/expat/portfile.cmake
View File

@ -1,8 +1,10 @@
set (EX_VERSION 2.4.1)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO libexpat/libexpat
REF c092d40c300c6d219cb3b111932a824022265370 #Head from commit 2020-08-18
SHA512 5a5d41b500f5602a32aea8f4e15593e639206bb3f97553497e80b2975360cac88ac90386f5efc11728614f24bbb620fb908a3c8ca71c9e7b312f6157b2477afe
REF a28238bdeebc087071777001245df1876a11f5ee #v2.4.1
SHA512 2c22f2dfab50644637a7777229849c91630ae8c50683df6ad6409d473690ce01b59ce9f98e66b0aeac8c650507f04edbb5d9738130c88b87bbc1adb7831c22a9
HEAD_REF master
PATCHES
pkgconfig.patch
@ -22,11 +24,12 @@ vcpkg_configure_cmake(
-DEXPAT_BUILD_TESTS=OFF
-DEXPAT_BUILD_TOOLS=OFF
-DEXPAT_SHARED_LIBS=${EXPAT_LINKAGE}
-DEXPAT_BUILD_PKGCONFIG=ON
)
vcpkg_install_cmake()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/expat-2.2.9)
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/expat-${EX_VERSION})
vcpkg_fixup_pkgconfig()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)

6
ports/expat/vcpkg.json Normal file
View File

@ -0,0 +1,6 @@
{
"name": "expat",
"version-semver": "2.4.1",
"description": "XML parser library written in C",
"homepage": "https://github.com/libexpat/libexpat"
}

2
versions/baseline.json
View File

@ -1889,7 +1889,7 @@
"port-version": 4
},
"expat": {
"baseline": "2020-08-18",
"baseline": "2.4.1",
"port-version": 0
},
"expected-lite": {

5
versions/e-/expat.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "d63d8c6684bc73856e3f684601761939e32feeb3",
"version-semver": "2.4.1",
"port-version": 0
},
{
"git-tree": "f9cd8671e2436416fa63363267574f508aadee9b",
"version-string": "2020-08-18",