mirror of https://github.com/microsoft/vcpkg.git
[botan] upgrade to 3.12.0 + fix CMake issues (#51600)
Co-authored-by: Victor Romero <romerosanchezv@gmail.com>
This commit is contained in:
parent
ccab4e210c
commit
1adfc38c89
|
|
@ -1,14 +0,0 @@
|
|||
diff --git a/src/build-data/botan.pc.in b/src/build-data/botan.pc.in
|
||||
index c18b522..a5722c9 100644
|
||||
--- a/src/build-data/botan.pc.in
|
||||
+++ b/src/build-data/botan.pc.in
|
||||
@@ -1,7 +1,7 @@
|
||||
prefix=%{prefix}
|
||||
exec_prefix=${prefix}
|
||||
-libdir=%{libdir}
|
||||
-includedir=${prefix}/include/botan-%{version_major}
|
||||
+libdir=${prefix}/lib
|
||||
+includedir=${prefix}/include
|
||||
|
||||
Name: Botan
|
||||
Description: Crypto and TLS for Modern C++
|
||||
|
|
@ -2,10 +2,9 @@ vcpkg_from_github(
|
|||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO randombit/botan
|
||||
REF "${VERSION}"
|
||||
SHA512 fe9197d11e1252829548fb5e015874d72bcd5894f9217b76ab509b9ece44d01efa0bfe5306d5aebd8f7feb97abd32970406ab2cd6f0af866aefa557f762afea4
|
||||
SHA512 33a47e5733aedc29704652bf16704a2cd080cdcebd01c95879b5db3af3186debbef711c53ef131a9cb7defe3dd8ffae49d6efe7e75aef9107473b92dc6b3f101
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
pkgconfig.patch
|
||||
verbose-install.patch
|
||||
configure-zlib.patch
|
||||
fix_android.patch
|
||||
|
|
@ -30,11 +29,14 @@ vcpkg_list(SET configure_arguments
|
|||
"--distribution-info=vcpkg ${TARGET_TRIPLET}"
|
||||
--disable-cc-tests
|
||||
--with-pkg-config
|
||||
--with-cmake-config
|
||||
--link-method=copy
|
||||
--with-debug-info
|
||||
--without-include-namespace
|
||||
--includedir=include
|
||||
--bindir=bin
|
||||
--libdir=lib
|
||||
--cmakeconfigdir=share/${PORT}
|
||||
--without-documentation
|
||||
"--with-external-includedir=${CURRENT_INSTALLED_DIR}/include"
|
||||
)
|
||||
|
|
@ -175,9 +177,7 @@ else()
|
|||
endif()
|
||||
endif()
|
||||
|
||||
vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/Botan-${VERSION}")
|
||||
|
||||
file(RENAME "${CURRENT_PACKAGES_DIR}/include/botan-3/botan" "${CURRENT_PACKAGES_DIR}/include/botan")
|
||||
vcpkg_cmake_config_fixup()
|
||||
|
||||
if(pkgconfig_requires)
|
||||
list(JOIN pkgconfig_requires ", " pkgconfig_requires)
|
||||
|
|
@ -191,7 +191,6 @@ vcpkg_fixup_pkgconfig()
|
|||
file(REMOVE_RECURSE
|
||||
"${CURRENT_PACKAGES_DIR}/debug/include"
|
||||
"${CURRENT_PACKAGES_DIR}/debug/share"
|
||||
"${CURRENT_PACKAGES_DIR}/include/botan-3"
|
||||
)
|
||||
|
||||
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/license.txt")
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "botan",
|
||||
"version": "3.11.1",
|
||||
"version": "3.12.0",
|
||||
"description": "A cryptography library written in C++11",
|
||||
"homepage": "https://botan.randombit.net",
|
||||
"license": "BSD-2-Clause",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "428820d0fc2b50690988802c366b87202f3e16e9",
|
||||
"version": "3.12.0",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "77fa2042e0e05e16b561e15e5aacbce0e467def4",
|
||||
"version": "3.11.1",
|
||||
|
|
|
|||
|
|
@ -1461,7 +1461,7 @@
|
|||
"port-version": 0
|
||||
},
|
||||
"botan": {
|
||||
"baseline": "3.11.1",
|
||||
"baseline": "3.12.0",
|
||||
"port-version": 0
|
||||
},
|
||||
"box2d": {
|
||||
|
|
|
|||
Loading…
Reference in New Issue