From 5b10c1878f8547789301fae2115fd09c6f461eb2 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 21 Jul 2025 07:10:56 +0000 Subject: [PATCH] dev-cpp/azure-core: Sync with Gentoo It's from Gentoo commit e94b98bbc710b88173531fb63be9fd9ffdbc9be2. Signed-off-by: Mathieu Tortuyaux --- .../dev-cpp/azure-core/Manifest | 2 +- .../azure-core/azure-core-1.15.0.ebuild | 2 +- ...1.14.0.ebuild => azure-core-1.16.0.ebuild} | 12 +- .../files/azure-sdk-for-cpp-soversion.patch | 216 ------------------ 4 files changed, 5 insertions(+), 227 deletions(-) rename sdk_container/src/third_party/portage-stable/dev-cpp/azure-core/{azure-core-1.14.0.ebuild => azure-core-1.16.0.ebuild} (79%) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-cpp/azure-core/files/azure-sdk-for-cpp-soversion.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/azure-core/Manifest b/sdk_container/src/third_party/portage-stable/dev-cpp/azure-core/Manifest index 55f2f85823..2f737167a7 100644 --- a/sdk_container/src/third_party/portage-stable/dev-cpp/azure-core/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-cpp/azure-core/Manifest @@ -1,2 +1,2 @@ -DIST azure-sdk-for-cpp-1289063cc2a7ba01fa7a8c7cd92155ef401c4cba.tar.gz 3130906 BLAKE2B 8fab2710f9c8bc5eb69b5f6bc389cf00cfaba1c6902ffa9a9e67e96bd91e508a9b1c643e57fbe74c68fa840bc707e00672ca0e3979baaabefb021849bb5815bb SHA512 19d122bd153ababd90d238a94b8227e56c17a677dc478fd680c099856fc874367a4c8aa83ccf372139400772951dad69899471970ac18088f901d67047b7755f DIST azure-sdk-for-cpp-b6e7a28c6200d50080c38a598cf92d96d45cf976.tar.gz 3166921 BLAKE2B 226fcc802050848f915fb125e6921d0957c9eabeb72039b21efe21fe7146d04eba35fee7d82ed1aef32ee103b85cdf0c5e0f5c1d890f60156e3457d97507d220 SHA512 3bc4eafce529157d34d2bdd80fbd302513b082c3a59a5f1b0ffc453a8867401382538ced9887e52b2b998f112ecad960b6146bf7f7cee37110d51ca5801eed82 +DIST azure-sdk-for-cpp-de3cc64a55b2a67d672b7ca899a8675182d1c989.tar.gz 3359660 BLAKE2B eda2034cc789ad6d5e1d477bbb5a3619a53ee22b511707b8aec9471dc8b09814b4b6c199442532790f7b43c07e21bfa3f6534cf49e1f46d7f8a5e60f3e5eecce SHA512 b6004de0e1f312bdd55f91f597d2ee831be9d3d500a0c554a8258f52d054c288a6caff3ae86cc023b9ee1167df9fd898d65278f0b076ae23b2e65e9ab5791d36 diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/azure-core/azure-core-1.15.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-cpp/azure-core/azure-core-1.15.0.ebuild index 9c59c0b02b..b5b78fc484 100644 --- a/sdk_container/src/third_party/portage-stable/dev-cpp/azure-core/azure-core-1.15.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-cpp/azure-core/azure-core-1.15.0.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/Azure/azure-sdk-for-cpp/archive/${COMMIT}.tar.gz -> S="${WORKDIR}/${MY_P}/sdk/core/${PN}" LICENSE="MIT" SLOT="0/${PV}" -KEYWORDS="~amd64" +KEYWORDS="amd64" IUSE="doc" RESTRICT="test" # Too many online tests. diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/azure-core/azure-core-1.14.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-cpp/azure-core/azure-core-1.16.0.ebuild similarity index 79% rename from sdk_container/src/third_party/portage-stable/dev-cpp/azure-core/azure-core-1.14.0.ebuild rename to sdk_container/src/third_party/portage-stable/dev-cpp/azure-core/azure-core-1.16.0.ebuild index dac17e6af5..118737dffc 100644 --- a/sdk_container/src/third_party/portage-stable/dev-cpp/azure-core/azure-core-1.14.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-cpp/azure-core/azure-core-1.16.0.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 inherit cmake -COMMIT="1289063cc2a7ba01fa7a8c7cd92155ef401c4cba" +COMMIT="de3cc64a55b2a67d672b7ca899a8675182d1c989" MY_P="azure-sdk-for-cpp-${COMMIT}" DESCRIPTION="Azure SDK for C++" HOMEPAGE="https://azure.github.io/azure-sdk-for-cpp/" @@ -13,7 +13,7 @@ SRC_URI="https://github.com/Azure/azure-sdk-for-cpp/archive/${COMMIT}.tar.gz -> S="${WORKDIR}/${MY_P}/sdk/core/${PN}" LICENSE="MIT" SLOT="0/${PV}" -KEYWORDS="amd64" +KEYWORDS="~amd64" IUSE="doc" RESTRICT="test" # Too many online tests. @@ -29,12 +29,6 @@ BDEPEND=" doc? ( app-text/doxygen ) " -src_prepare() { - cmake_src_prepare - cd ../../.. || die - eapply "${FILESDIR}"/azure-sdk-for-cpp-soversion.patch -} - src_configure() { local mycmakeargs=( -DBUILD_DOCUMENTATION=$(usex doc) diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/azure-core/files/azure-sdk-for-cpp-soversion.patch b/sdk_container/src/third_party/portage-stable/dev-cpp/azure-core/files/azure-sdk-for-cpp-soversion.patch deleted file mode 100644 index 550f9f2284..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-cpp/azure-core/files/azure-sdk-for-cpp-soversion.patch +++ /dev/null @@ -1,216 +0,0 @@ -diff --git a/sdk/attestation/azure-security-attestation/CMakeLists.txt b/sdk/attestation/azure-security-attestation/CMakeLists.txt -index 8dec8cf..dff3461 100644 ---- a/sdk/attestation/azure-security-attestation/CMakeLists.txt -+++ b/sdk/attestation/azure-security-attestation/CMakeLists.txt -@@ -86,6 +86,7 @@ create_code_coverage(attestation azure-security-attestation azure-security-attes - - - get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp") -+set_target_properties(azure-security-attestation PROPERTIES VERSION ${AZ_LIBRARY_VERSION}) - generate_documentation(azure-security-attestation ${AZ_LIBRARY_VERSION}) - - az_vcpkg_export( -diff --git a/sdk/core/azure-core-amqp/CMakeLists.txt b/sdk/core/azure-core-amqp/CMakeLists.txt -index 3ef7bf8..e99d57f 100644 ---- a/sdk/core/azure-core-amqp/CMakeLists.txt -+++ b/sdk/core/azure-core-amqp/CMakeLists.txt -@@ -177,6 +177,7 @@ target_link_libraries(azure-core-amqp PRIVATE - PUBLIC Azure::azure-core) - - get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp") -+set_target_properties(azure-core-amqp PROPERTIES VERSION ${AZ_LIBRARY_VERSION}) - generate_documentation(azure-core-amqp ${AZ_LIBRARY_VERSION}) - - az_vcpkg_export( -diff --git a/sdk/core/azure-core-tracing-opentelemetry/CMakeLists.txt b/sdk/core/azure-core-tracing-opentelemetry/CMakeLists.txt -index 23cf7d1..3834d6c 100644 ---- a/sdk/core/azure-core-tracing-opentelemetry/CMakeLists.txt -+++ b/sdk/core/azure-core-tracing-opentelemetry/CMakeLists.txt -@@ -80,6 +80,7 @@ if (BUILD_AZURE_CORE_TRACING_OPENTELEMETRY) - endif() - - get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp") -+set_target_properties(azure-core-tracing-opentelemetry PROPERTIES VERSION ${AZ_LIBRARY_VERSION}) - generate_documentation(azure-core-tracing-opentelemetry ${AZ_LIBRARY_VERSION}) - - if(BUILD_AZURE_CORE_TRACING_OPENTELEMETRY) -diff --git a/sdk/core/azure-core/CMakeLists.txt b/sdk/core/azure-core/CMakeLists.txt -index 87c5cfd..9dbf5a0 100644 ---- a/sdk/core/azure-core/CMakeLists.txt -+++ b/sdk/core/azure-core/CMakeLists.txt -@@ -192,6 +192,7 @@ if(BUILD_TRANSPORT_WINHTTP) - endif() - - get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp") -+set_target_properties(azure-core PROPERTIES VERSION ${AZ_LIBRARY_VERSION}) - generate_documentation(azure-core ${AZ_LIBRARY_VERSION}) - - az_vcpkg_export( -diff --git a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/CMakeLists.txt b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/CMakeLists.txt -index 2152690..4af757c 100644 ---- a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/CMakeLists.txt -+++ b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/CMakeLists.txt -@@ -91,6 +91,7 @@ target_link_libraries(azure-messaging-eventhubs-checkpointstore-blob - create_code_coverage(eventhubs azure-messaging-eventhubs-checkpointstore-blob azure-messaging-eventhubs-blobcheckpointstore-test "tests?/*;samples?/*") - - get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp") -+set_target_properties(azure-messaging-eventhubs-checkpointstore-blob PROPERTIES VERSION ${AZ_LIBRARY_VERSION}) - #generate_documentation(azure-messaging-eventhubs-checkpointstore-blob ${AZ_LIBRARY_VERSION}) - generate_documentation(azure-messaging-eventhubs-checkpointstore-blob ${AZ_LIBRARY_VERSION}) - -diff --git a/sdk/eventhubs/azure-messaging-eventhubs/CMakeLists.txt b/sdk/eventhubs/azure-messaging-eventhubs/CMakeLists.txt -index 0ea0b8e..e0dbe51 100644 ---- a/sdk/eventhubs/azure-messaging-eventhubs/CMakeLists.txt -+++ b/sdk/eventhubs/azure-messaging-eventhubs/CMakeLists.txt -@@ -116,6 +116,7 @@ target_compile_definitions(azure-messaging-eventhubs PRIVATE _azure_BUILDING_SDK - create_code_coverage(eventhubs azure-messaging-eventhubs azure-messaging-eventhubs-test "tests?/*;samples?/*") - - get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp") -+set_target_properties(azure-messaging-eventhubs PROPERTIES VERSION ${AZ_LIBRARY_VERSION}) - generate_documentation(azure-messaging-eventhubs ${AZ_LIBRARY_VERSION}) - - add_subdirectory(test) -diff --git a/sdk/identity/azure-identity/CMakeLists.txt b/sdk/identity/azure-identity/CMakeLists.txt -index 57fe6bb..3c21177 100644 ---- a/sdk/identity/azure-identity/CMakeLists.txt -+++ b/sdk/identity/azure-identity/CMakeLists.txt -@@ -117,6 +117,7 @@ else() - endif() - - get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp") -+set_target_properties(azure-identity PROPERTIES VERSION ${AZ_LIBRARY_VERSION}) - generate_documentation(azure-identity ${AZ_LIBRARY_VERSION}) - - az_vcpkg_export( -diff --git a/sdk/keyvault/azure-security-keyvault-administration/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-administration/CMakeLists.txt -index 5f70eb3..b065d33 100644 ---- a/sdk/keyvault/azure-security-keyvault-administration/CMakeLists.txt -+++ b/sdk/keyvault/azure-security-keyvault-administration/CMakeLists.txt -@@ -95,6 +95,7 @@ target_compile_definitions(azure-security-keyvault-administration PRIVATE _azure - create_code_coverage(keyvault azure-security-keyvault-administration azure-security-keyvault-administration-test "tests?/*;samples?/*") - - get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp") -+set_target_properties(azure-security-keyvault-administration PROPERTIES VERSION ${AZ_LIBRARY_VERSION}) - generate_documentation(azure-security-keyvault-administration ${AZ_LIBRARY_VERSION}) - if(BUILD_TESTING) - -diff --git a/sdk/keyvault/azure-security-keyvault-certificates/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-certificates/CMakeLists.txt -index 0806e09..8014038 100644 ---- a/sdk/keyvault/azure-security-keyvault-certificates/CMakeLists.txt -+++ b/sdk/keyvault/azure-security-keyvault-certificates/CMakeLists.txt -@@ -100,6 +100,7 @@ target_compile_definitions(azure-security-keyvault-certificates PRIVATE _azure_B - create_code_coverage(keyvault azure-security-keyvault-certificates azure-security-keyvault-certificates-test "tests?/*;samples?/*") - - get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp") -+set_target_properties(azure-security-keyvault-certificates PROPERTIES VERSION ${AZ_LIBRARY_VERSION}) - generate_documentation(azure-security-keyvault-certificates ${AZ_LIBRARY_VERSION}) - - if(BUILD_TESTING) -diff --git a/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt -index 6217fd1..2de5e64 100644 ---- a/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt -+++ b/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt -@@ -138,6 +138,7 @@ target_compile_definitions(azure-security-keyvault-keys PRIVATE _azure_BUILDING_ - create_code_coverage(keyvault azure-security-keyvault-keys azure-security-keyvault-keys-test "tests?/*;samples?/*") - - get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp") -+set_target_properties(azure-security-keyvault-keys PROPERTIES VERSION ${AZ_LIBRARY_VERSION}) - generate_documentation(azure-security-keyvault-keys ${AZ_LIBRARY_VERSION}) - - if(BUILD_TESTING) -diff --git a/sdk/keyvault/azure-security-keyvault-secrets/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-secrets/CMakeLists.txt -index 7cc62a8..3664d8c 100644 ---- a/sdk/keyvault/azure-security-keyvault-secrets/CMakeLists.txt -+++ b/sdk/keyvault/azure-security-keyvault-secrets/CMakeLists.txt -@@ -115,6 +115,7 @@ target_compile_definitions(azure-security-keyvault-secrets PRIVATE _azure_BUILDI - create_code_coverage(keyvault azure-security-keyvault-secrets azure-security-keyvault-secrets-test "tests?/*;samples?/*") - - get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp") -+set_target_properties(azure-security-keyvault-secrets PROPERTIES VERSION ${AZ_LIBRARY_VERSION}) - generate_documentation(azure-security-keyvault-secrets ${AZ_LIBRARY_VERSION}) - if(BUILD_TESTING) - -diff --git a/sdk/storage/azure-storage-blobs/CMakeLists.txt b/sdk/storage/azure-storage-blobs/CMakeLists.txt -index f87ceae..657ef33 100644 ---- a/sdk/storage/azure-storage-blobs/CMakeLists.txt -+++ b/sdk/storage/azure-storage-blobs/CMakeLists.txt -@@ -96,6 +96,7 @@ target_link_libraries(azure-storage-blobs PUBLIC Azure::azure-storage-common) - target_compile_definitions(azure-storage-blobs PRIVATE _azure_BUILDING_SDK) - - get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp") -+set_target_properties(azure-storage-blobs PROPERTIES VERSION ${AZ_LIBRARY_VERSION}) - generate_documentation(azure-storage-blobs ${AZ_LIBRARY_VERSION}) - - az_vcpkg_export( -diff --git a/sdk/storage/azure-storage-common/CMakeLists.txt b/sdk/storage/azure-storage-common/CMakeLists.txt -index 30f056d..ce90e8a 100644 ---- a/sdk/storage/azure-storage-common/CMakeLists.txt -+++ b/sdk/storage/azure-storage-common/CMakeLists.txt -@@ -107,6 +107,7 @@ else() - endif() - - get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp") -+set_target_properties(azure-storage-common PROPERTIES VERSION ${AZ_LIBRARY_VERSION}) - generate_documentation(azure-storage-common ${AZ_LIBRARY_VERSION}) - - az_vcpkg_export( -diff --git a/sdk/storage/azure-storage-files-datalake/CMakeLists.txt b/sdk/storage/azure-storage-files-datalake/CMakeLists.txt -index 71905c8..ac82507 100644 ---- a/sdk/storage/azure-storage-files-datalake/CMakeLists.txt -+++ b/sdk/storage/azure-storage-files-datalake/CMakeLists.txt -@@ -92,6 +92,7 @@ target_include_directories( - target_link_libraries(azure-storage-files-datalake PUBLIC Azure::azure-storage-blobs) - - get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp") -+set_target_properties(azure-storage-files-datalake PROPERTIES VERSION ${AZ_LIBRARY_VERSION}) - generate_documentation(azure-storage-files-datalake ${AZ_LIBRARY_VERSION}) - - az_vcpkg_export( -diff --git a/sdk/storage/azure-storage-files-shares/CMakeLists.txt b/sdk/storage/azure-storage-files-shares/CMakeLists.txt -index 891f954..cf6cd92 100644 ---- a/sdk/storage/azure-storage-files-shares/CMakeLists.txt -+++ b/sdk/storage/azure-storage-files-shares/CMakeLists.txt -@@ -88,6 +88,7 @@ target_include_directories( - target_link_libraries(azure-storage-files-shares PUBLIC Azure::azure-storage-common) - - get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp") -+set_target_properties(azure-storage-files-shares PROPERTIES VERSION ${AZ_LIBRARY_VERSION}) - generate_documentation(azure-storage-files-shares ${AZ_LIBRARY_VERSION}) - - az_vcpkg_export( -diff --git a/sdk/storage/azure-storage-queues/CMakeLists.txt b/sdk/storage/azure-storage-queues/CMakeLists.txt -index e567623..2e340d5 100644 ---- a/sdk/storage/azure-storage-queues/CMakeLists.txt -+++ b/sdk/storage/azure-storage-queues/CMakeLists.txt -@@ -81,6 +81,7 @@ target_include_directories( - target_link_libraries(azure-storage-queues PUBLIC Azure::azure-storage-common) - - get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp") -+set_target_properties(azure-storage-queues PROPERTIES VERSION ${AZ_LIBRARY_VERSION}) - generate_documentation(azure-storage-queues ${AZ_LIBRARY_VERSION}) - - az_vcpkg_export( -diff --git a/sdk/tables/azure-data-tables/CMakeLists.txt b/sdk/tables/azure-data-tables/CMakeLists.txt -index 038e267..d7e7976 100644 ---- a/sdk/tables/azure-data-tables/CMakeLists.txt -+++ b/sdk/tables/azure-data-tables/CMakeLists.txt -@@ -106,6 +106,7 @@ target_include_directories( - target_link_libraries(azure-data-tables PUBLIC Azure::azure-core) - - get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp") -+set_target_properties(azure-data-tables PROPERTIES VERSION ${AZ_LIBRARY_VERSION}) - generate_documentation(azure-data-tables ${AZ_LIBRARY_VERSION}) - - az_vcpkg_export( -diff --git a/sdk/template/azure-template/CMakeLists.txt b/sdk/template/azure-template/CMakeLists.txt -index 84e3d17..43f3320 100644 ---- a/sdk/template/azure-template/CMakeLists.txt -+++ b/sdk/template/azure-template/CMakeLists.txt -@@ -78,6 +78,7 @@ add_library(Azure::azure-template ALIAS azure-template) - create_code_coverage(template azure-template azure-template-test "tests?/*;samples?/*") - - get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp") -+set_target_properties(azure-template PROPERTIES VERSION ${AZ_LIBRARY_VERSION}) - generate_documentation(azure-template ${AZ_LIBRARY_VERSION}) - - az_vcpkg_export(