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

[expat] Update to 2.4.9 (#27059)

Browse Source
This commit is contained in:
Osyotr 2022-10-06 02:03:23 +03:00 committed by GitHub
parent e7fc86a261
commit 6a8c0e37a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 37 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ports/expat/pkgconfig_fix.patch Normal file
View File

@ -0,0 +1,22 @@
--- a/expat/CMakeLists.txt
+++ b/expat/CMakeLists.txt
@@ -469,7 +469,7 @@ if(WIN32 AND NOT MINGW)
# Everything but MSVC is already adding prefix "lib", automatically.
# NOTE: "set_property(TARGET expat PROPERTY PREFIX lib)" would only affect *.dll
# files but not *.lib files, so we have to rely on property OUTPUT_NAME, instead.
- # Property CMAKE_*_POSTFIX still applies.
+ # Property EXPAT_*_POSTFIX still applies.
set(_EXPAT_OUTPUT_NAME libexpat)
set_property(TARGET expat PROPERTY OUTPUT_NAME ${_EXPAT_OUTPUT_NAME})
else()
@@ -520,8 +520,8 @@ if(EXPAT_BUILD_PKGCONFIG)
foreach(_build_type ${CMAKE_BUILD_TYPE} Debug Release RelWithDebInfo MinSizeRel)
string(TOLOWER "${_build_type}" _build_type_lower)
string(TOUPPER "${_build_type}" _build_type_upper)
- set_property(TARGET expat PROPERTY "pkgconfig_${_build_type_lower}_name" "expat${CMAKE_${_build_type_upper}_POSTFIX}")
- set_property(TARGET expat PROPERTY "pkgconfig_${_build_type_lower}_output_name" "${_EXPAT_OUTPUT_NAME}${CMAKE_${_build_type_upper}_POSTFIX}")
+ set_property(TARGET expat PROPERTY "pkgconfig_${_build_type_lower}_name" "expat${EXPAT_${_build_type_upper}_POSTFIX}")
+ set_property(TARGET expat PROPERTY "pkgconfig_${_build_type_lower}_output_name" "${_EXPAT_OUTPUT_NAME}${EXPAT_${_build_type_upper}_POSTFIX}")
if(_EXPAT_LIBM_FOUND)
set_property(TARGET expat PROPERTY "pkgconfig_libm" "-lm")
else()

11
ports/expat/portfile.cmake
View File

@ -1,11 +1,14 @@
set(EX_VERSION 2.4.8)
file(READ ${CMAKE_CURRENT_LIST_DIR}/vcpkg.json vcpkg_json)
string(JSON VERSION GET "${vcpkg_json}" "version")
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO libexpat/libexpat
REF 3bab6c09bbe8bf42d84b81563ddbcf4cca4be838 #v2.4.8
SHA512 6bddf6514183b3bfa6bf869e63cf838cfe2912941ef04543bce00bee84a305f494368fb7cbd80404d06877a1d8da82de5ac2b44074b25e34aeaee7949d37e451
REF R_2_4_9
SHA512 6bf92516ce2642b2cdcbc586aaac0f706f125394fa428670f9b8b042a1f393e3b9dda1a24e58e6c8ad8b4ff3303cb5a8700628c6c04a881a06251c08be3759d3
HEAD_REF master
PATCHES
"pkgconfig_fix.patch" # https://github.com/libexpat/libexpat/pull/656
)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" EXPAT_LINKAGE)
@ -23,7 +26,7 @@ vcpkg_cmake_configure(
vcpkg_cmake_install()
vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/expat-${EX_VERSION}")
vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/expat-${VERSION}")
vcpkg_fixup_pkgconfig()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

3
ports/expat/vcpkg.json
View File

@ -1,7 +1,6 @@
{
"name": "expat",
"version": "2.4.8",
"port-version": 1,
"version": "2.4.9",
"description": "XML parser library written in C",
"homepage": "https://github.com/libexpat/libexpat",
"license": "MIT",

4
versions/baseline.json
View File

@ -2185,8 +2185,8 @@
"port-version": 1
},
"expat": {
"baseline": "2.4.8",
"port-version": 1
"baseline": "2.4.9",
"port-version": 0
},
"expected-lite": {
"baseline": "0.6.2",

5
versions/e-/expat.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "e9bfabcd9e9f47060a34457ad5e28da5e100c027",
"version": "2.4.9",
"port-version": 0
},
{
"git-tree": "18754c99766e364a887a08bbf85c7fae06185f36",
"version": "2.4.8",