[expat]update to 2.4.8 (#22575)

* [expat]update to 2.4.3

* update version

* delete patch

* update version

* delete patch

* overwrite version

* update version 2.4.4

* update version

* delete git-tree

* update version to 2.4.7

* update version

* delete version-json

* update to 2.4.8

* update version
This commit is contained in:
Frank 2022-04-02 06:57:36 +08:00 committed by GitHub
parent 6fa767aca9
commit 656e0afa0d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 29 additions and 30 deletions

View File

@ -1,13 +0,0 @@
diff --git a/expat/CMakeLists.txt b/expat/CMakeLists.txt
index cd12a99..03c2c4d 100644
--- a/expat/CMakeLists.txt
+++ b/expat/CMakeLists.txt
@@ -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(EXPAT_BUILD_PKGCONFIG)
set(prefix ${CMAKE_INSTALL_PREFIX})
set(exec_prefix "\${prefix}")

View File

@ -1,13 +1,11 @@
set (EX_VERSION 2.4.1)
set (EX_VERSION 2.4.8)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO libexpat/libexpat
REF a28238bdeebc087071777001245df1876a11f5ee #v2.4.1
SHA512 2c22f2dfab50644637a7777229849c91630ae8c50683df6ad6409d473690ce01b59ce9f98e66b0aeac8c650507f04edbb5d9738130c88b87bbc1adb7831c22a9
REF 3bab6c09bbe8bf42d84b81563ddbcf4cca4be838 #v2.4.8
SHA512 6bddf6514183b3bfa6bf869e63cf838cfe2912941ef04543bce00bee84a305f494368fb7cbd80404d06877a1d8da82de5ac2b44074b25e34aeaee7949d37e451
HEAD_REF master
PATCHES
pkgconfig.patch
)
if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
@ -16,9 +14,8 @@ else()
set(EXPAT_LINKAGE OFF)
endif()
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}/expat
PREFER_NINJA
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}/expat"
OPTIONS
-DEXPAT_BUILD_EXAMPLES=OFF
-DEXPAT_BUILD_TESTS=OFF
@ -27,13 +24,13 @@ vcpkg_configure_cmake(
-DEXPAT_BUILD_PKGCONFIG=ON
)
vcpkg_install_cmake()
vcpkg_cmake_install()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/expat-${EX_VERSION})
vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/expat-${EX_VERSION}")
vcpkg_fixup_pkgconfig()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/expat_external.h
@ -45,6 +42,6 @@ endif()
vcpkg_copy_pdbs()
#Handle copyright
file(INSTALL ${SOURCE_PATH}/expat/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(INSTALL "${SOURCE_PATH}/expat/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")

View File

@ -1,6 +1,16 @@
{
"name": "expat",
"version-semver": "2.4.1",
"version": "2.4.8",
"description": "XML parser library written in C",
"homepage": "https://github.com/libexpat/libexpat"
"homepage": "https://github.com/libexpat/libexpat",
"dependencies": [
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}

View File

@ -2085,7 +2085,7 @@
"port-version": 1
},
"expat": {
"baseline": "2.4.1",
"baseline": "2.4.8",
"port-version": 0
},
"expected-lite": {

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "35013cd612175defc1832114f6a841888a6f6aad",
"version": "2.4.8",
"port-version": 0
},
{
"git-tree": "d63d8c6684bc73856e3f684601761939e32feeb3",
"version-semver": "2.4.1",