[BoringSSL] rm debug suffix non-Windows, short name in UNIX pc (#34459)

This commit is contained in:
Stephen Birarda 2023-10-13 19:06:57 +01:00 коммит произвёл GitHub
Родитель 860c966502
Коммит 640cb26c1a
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
5 изменённых файлов: 23 добавлений и 10 удалений

Просмотреть файл

@ -3,6 +3,8 @@ function(install_pc_file name pc_data)
if (NOT VCPKG_TARGET_IS_WINDOWS)
string(REPLACE "-lcrypt32" "" pc_data "${pc_data}")
string(REPLACE "-lws2_32" "" pc_data "${pc_data}")
string(REPLACE "-llibssl" "-lssl" pc_data "${pc_data}")
string(REPLACE "-llibcrypto" "-lcrypto" pc_data "${pc_data}")
elseif (NOT VCPKG_TARGET_IS_MINGW)
string(REPLACE "-llibssl" "-lssl" pc_data "${pc_data}")
string(REPLACE "-llibcrypto" "-lcrypto" pc_data "${pc_data}")
@ -11,12 +13,14 @@ function(install_pc_file name pc_data)
configure_file("${CMAKE_CURRENT_LIST_DIR}/openssl.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${name}.pc" @ONLY)
endif()
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
string(REPLACE "-lssl" "-lssld" pc_data "${pc_data}")
string(REPLACE "-lcrypto" "-lcryptod" pc_data "${pc_data}")
else()
string(REPLACE "-llibssl" "-llibssld" pc_data "${pc_data}")
string(REPLACE "-llibcrypto" "-llibcryptod" pc_data "${pc_data}")
if(VCPKG_TARGET_IS_WINDOWS)
if (NOT VCPKG_TARGET_IS_MINGW)
string(REPLACE "-lssl" "-lssld" pc_data "${pc_data}")
string(REPLACE "-lcrypto" "-lcryptod" pc_data "${pc_data}")
else()
string(REPLACE "-llibssl" "-llibssld" pc_data "${pc_data}")
string(REPLACE "-llibcrypto" "-llibcryptod" pc_data "${pc_data}")
endif()
endif()
configure_file("${CMAKE_CURRENT_LIST_DIR}/openssl.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${name}.pc" @ONLY)
endif()

Просмотреть файл

@ -26,11 +26,15 @@ vcpkg_from_github(
0003-fix-shared-symbol-visibility.patch
)
if(VCPKG_TARGET_IS_WINDOWS)
# the FindOpenSSL.cmake script differentiates debug and release binaries using this suffix.
set(CMAKE_CONFIGURE_OPTIONS_DEBUG "-DCMAKE_DEBUG_POSTFIX=d")
endif()
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS_DEBUG
# the FindOpenSSL.cmake script differentiates debug and release binaries using this suffix.
-DCMAKE_DEBUG_POSTFIX=d
${CMAKE_CONFIGURE_OPTIONS_DEBUG}
)
vcpkg_cmake_install()

Просмотреть файл

@ -1,6 +1,6 @@
{
"name": "boringssl",
"version-date": "2023-09-25",
"version-date": "2023-10-13",
"description": "BoringSSL is a fork of OpenSSL developed by Google",
"homepage": "https://boringssl.googlesource.com/boringssl",
"supports": "!uwp",

Просмотреть файл

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "2b809260036c7ee69cbf1a8a06e015354121d741",
"version-date": "2023-10-13",
"port-version": 0
},
{
"git-tree": "5f833bab8ecfc28f45a9034291e79f8cd126ad01",
"version-date": "2023-09-25",

Просмотреть файл

@ -1289,7 +1289,7 @@
"port-version": 0
},
"boringssl": {
"baseline": "2023-09-25",
"baseline": "2023-10-13",
"port-version": 0
},
"botan": {