From b2bd926cdc54514d6b21f3d20452e216f080bffe Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Fri, 5 Apr 2024 03:56:30 +0100 Subject: [PATCH] fix: chore: Squash commits for 9.8.0 gold release The upstream liblzma has been suspended from github and is no longer available. Signed-off-by: Gordon Smith Signed-off-by: Michael Gardner --- .github/workflows/prebuild-docker.yml | 2 +- .github/workflows/prebuild-gh_envs.yml | 2 +- dockerfiles/amazonlinux.dockerfile | 12 +- dockerfiles/build.sh | 3 +- dockerfiles/centos-7.dockerfile | 12 +- dockerfiles/centos-8.dockerfile | 9 +- dockerfiles/rockylinux-8.dockerfile | 5 +- overlays/liblzma/add_support_ios.patch | 20 ++ overlays/liblzma/build-tools.patch | 20 ++ overlays/liblzma/fix_config_include.patch | 12 + overlays/liblzma/portfile.cmake | 86 +++++++ overlays/liblzma/usage | 9 + overlays/liblzma/vcpkg-cmake-wrapper.cmake | 64 +++++ overlays/liblzma/vcpkg.json | 23 ++ overlays/liblzma/win_output_name.patch | 17 ++ overlays/nlp-engine/portfile.cmake | 2 +- overlays/nlp-engine/vcpkg.json | 2 +- .../add-missing-find-dependency.patch | 13 - .../fix-nominmax-problems.patch | 224 ------------------ .../hpcc-remove-unsafe-onfork.patch | 56 ----- overlays/opentelemetry-cpp/portfile.cmake | 83 ------- overlays/opentelemetry-cpp/vcpkg.json | 62 ----- overlays/overlay_changelog_9.8.0 | 7 + vcpkg-configuration.json | 2 +- vcpkg.json | 2 +- 25 files changed, 287 insertions(+), 462 deletions(-) create mode 100644 overlays/liblzma/add_support_ios.patch create mode 100644 overlays/liblzma/build-tools.patch create mode 100644 overlays/liblzma/fix_config_include.patch create mode 100644 overlays/liblzma/portfile.cmake create mode 100644 overlays/liblzma/usage create mode 100644 overlays/liblzma/vcpkg-cmake-wrapper.cmake create mode 100644 overlays/liblzma/vcpkg.json create mode 100644 overlays/liblzma/win_output_name.patch delete mode 100644 overlays/opentelemetry-cpp/add-missing-find-dependency.patch delete mode 100644 overlays/opentelemetry-cpp/fix-nominmax-problems.patch delete mode 100644 overlays/opentelemetry-cpp/hpcc-remove-unsafe-onfork.patch delete mode 100644 overlays/opentelemetry-cpp/portfile.cmake delete mode 100644 overlays/opentelemetry-cpp/vcpkg.json create mode 100644 overlays/overlay_changelog_9.8.0 diff --git a/.github/workflows/prebuild-docker.yml b/.github/workflows/prebuild-docker.yml index f7e5fa227cf620..ff3b05a10701e4 100644 --- a/.github/workflows/prebuild-docker.yml +++ b/.github/workflows/prebuild-docker.yml @@ -5,7 +5,7 @@ on: tags: - "*" branches: - - "hpcc-platform-9.6.x" + - "hpcc-platform-9.8.x" workflow_call: inputs: diff --git a/.github/workflows/prebuild-gh_envs.yml b/.github/workflows/prebuild-gh_envs.yml index ed2a7621a799be..f4cf4f68360ed3 100644 --- a/.github/workflows/prebuild-gh_envs.yml +++ b/.github/workflows/prebuild-gh_envs.yml @@ -6,7 +6,7 @@ env: on: push: branches: - - "hpcc-platform-9.6.x" + - "hpcc-platform-9.8.x" workflow_call: inputs: diff --git a/dockerfiles/amazonlinux.dockerfile b/dockerfiles/amazonlinux.dockerfile index 3b1a52337954b5..4fe006231aaaee 100644 --- a/dockerfiles/amazonlinux.dockerfile +++ b/dockerfiles/amazonlinux.dockerfile @@ -44,7 +44,7 @@ RUN ./configure --prefix=/usr/local/pkg_config/0_29_2 --with-internal-glib && \ ENV PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig ENV ACLOCAL_PATH=$ACLOCAL_PATH:/usr/local/share/aclocal -RUN curl -o autoconf-2.71.tar.gz http://ftp.gnu.org/gnu/autoconf/autoconf-2.71.tar.gz && \ +RUN curl -o autoconf-2.71.tar.gz https://ftp.gnu.org/gnu/autoconf/autoconf-2.71.tar.gz && \ gunzip autoconf-2.71.tar.gz && \ tar xvf autoconf-2.71.tar && \ cd autoconf-2.71 && \ @@ -52,7 +52,7 @@ RUN curl -o autoconf-2.71.tar.gz http://ftp.gnu.org/gnu/autoconf/autoconf-2.71.t make && \ make install -RUN curl -o autoconf-archive-2021.02.19.tar.xz http://ftp.gnu.org/gnu/autoconf-archive/autoconf-archive-2021.02.19.tar.xz && \ +RUN curl -o autoconf-archive-2021.02.19.tar.xz https://ftp.gnu.org/gnu/autoconf-archive/autoconf-archive-2021.02.19.tar.xz && \ xz -d -v autoconf-archive-2021.02.19.tar.xz && \ tar xvf autoconf-archive-2021.02.19.tar && \ cd autoconf-archive-2021.02.19 && \ @@ -60,14 +60,14 @@ RUN curl -o autoconf-archive-2021.02.19.tar.xz http://ftp.gnu.org/gnu/autoconf-a make && \ make install -RUN curl -o automake-1.16.5.tar.gz http://ftp.gnu.org/gnu/automake/automake-1.16.5.tar.gz && \ +RUN curl -o automake-1.16.5.tar.gz https://ftp.gnu.org/gnu/automake/automake-1.16.5.tar.gz && \ tar xvzf automake-1.16.5.tar.gz && \ cd automake-1.16.5 && \ ./configure && \ make && \ make install -RUN curl -o libtool-2.4.6.tar.gz http://ftp.jaist.ac.jp/pub/GNU/libtool/libtool-2.4.6.tar.gz && \ +RUN curl -o libtool-2.4.6.tar.gz https://ftp.jaist.ac.jp/pub/GNU/libtool/libtool-2.4.6.tar.gz && \ tar xvfz libtool-2.4.6.tar.gz && \ cd libtool-2.4.6 && \ ./configure --prefix=/usr/local/libtool/2_4_6 && \ @@ -98,10 +98,10 @@ RUN ln -s /usr/local/libtool/2_4_6/bin/libtool /usr/local/bin/ && \ FROM base_build AS vcpkg_build # Build Tools - Mono --- -RUN yum-config-manager --add-repo http://download.mono-project.com/repo/centos/ && \ +RUN yum-config-manager --add-repo https://download.mono-project.com/repo/centos/ && \ yum clean all && \ yum makecache && \ - rpm --import "http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF" && \ + rpm --import "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF" && \ yum install -y mono-complete && \ yum -y clean all && rm -rf /var/cache diff --git a/dockerfiles/build.sh b/dockerfiles/build.sh index 4deb3476d2f39b..f5b36a72d326ed 100755 --- a/dockerfiles/build.sh +++ b/dockerfiles/build.sh @@ -65,7 +65,8 @@ function doBuild() { # doBuild ubuntu-24.04 # doBuild amazonlinux # doBuild centos-7 & -doBuild rockylinux-8 & +doBuild centos-8 & +# doBuild rockylinux-8 & # doBuild ubuntu-24.04 & # doBuild ubuntu-23.04 & # doBuild ubuntu-22.04 & diff --git a/dockerfiles/centos-7.dockerfile b/dockerfiles/centos-7.dockerfile index 4c59f1d3b043db..e402c5bd1bc025 100644 --- a/dockerfiles/centos-7.dockerfile +++ b/dockerfiles/centos-7.dockerfile @@ -38,7 +38,7 @@ RUN ./configure --prefix=/usr/local/pkg_config/0_29_2 --with-internal-glib && \ ENV PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig ENV ACLOCAL_PATH=$ACLOCAL_PATH:/usr/local/share/aclocal -RUN curl -o autoconf-2.71.tar.gz http://ftp.gnu.org/gnu/autoconf/autoconf-2.71.tar.gz && \ +RUN curl -o autoconf-2.71.tar.gz https://ftp.gnu.org/gnu/autoconf/autoconf-2.71.tar.gz && \ gunzip autoconf-2.71.tar.gz && \ tar xvf autoconf-2.71.tar && \ cd autoconf-2.71 && \ @@ -46,7 +46,7 @@ RUN curl -o autoconf-2.71.tar.gz http://ftp.gnu.org/gnu/autoconf/autoconf-2.71.t make && \ make install -RUN curl -o autoconf-archive-2021.02.19.tar.xz http://ftp.gnu.org/gnu/autoconf-archive/autoconf-archive-2021.02.19.tar.xz && \ +RUN curl -o autoconf-archive-2021.02.19.tar.xz https://ftp.gnu.org/gnu/autoconf-archive/autoconf-archive-2021.02.19.tar.xz && \ xz -d -v autoconf-archive-2021.02.19.tar.xz && \ tar xvf autoconf-archive-2021.02.19.tar && \ cd autoconf-archive-2021.02.19 && \ @@ -54,14 +54,14 @@ RUN curl -o autoconf-archive-2021.02.19.tar.xz http://ftp.gnu.org/gnu/autoconf-a make && \ make install -RUN curl -o automake-1.16.5.tar.gz http://ftp.gnu.org/gnu/automake/automake-1.16.5.tar.gz && \ +RUN curl -o automake-1.16.5.tar.gz https://ftp.gnu.org/gnu/automake/automake-1.16.5.tar.gz && \ tar xvzf automake-1.16.5.tar.gz && \ cd automake-1.16.5 && \ ./configure && \ make && \ make install -RUN curl -o libtool-2.4.6.tar.gz http://ftp.jaist.ac.jp/pub/GNU/libtool/libtool-2.4.6.tar.gz && \ +RUN curl -o libtool-2.4.6.tar.gz https://ftp.jaist.ac.jp/pub/GNU/libtool/libtool-2.4.6.tar.gz && \ tar xvfz libtool-2.4.6.tar.gz && \ cd libtool-2.4.6 && \ ./configure --prefix=/usr/local/libtool/2_4_6 && \ @@ -92,10 +92,10 @@ RUN ln -s /usr/local/libtool/2_4_6/bin/libtool /usr/local/bin/ && \ FROM base_build AS vcpkg_build # Build Tools - Mono --- -RUN yum-config-manager --add-repo http://download.mono-project.com/repo/centos/ && \ +RUN yum-config-manager --add-repo https://download.mono-project.com/repo/centos/ && \ yum clean all && \ yum makecache && \ - rpm --import "http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF" && \ + rpm --import "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF" && \ yum install -y mono-complete && \ yum -y clean all && rm -rf /var/cache diff --git a/dockerfiles/centos-8.dockerfile b/dockerfiles/centos-8.dockerfile index f20145e04dc95f..3e6261c9b3fead 100644 --- a/dockerfiles/centos-8.dockerfile +++ b/dockerfiles/centos-8.dockerfile @@ -1,4 +1,7 @@ -FROM tgagor/centos-stream:stream8 AS base_build +FROM tgagor/centos:stream8 AS base_build + +RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*.repo +RUN sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*.repo RUN yum update -y && yum install -y dnf-plugins-core && \ dnf config-manager --set-enabled powertools && \ @@ -25,10 +28,10 @@ SHELL ["/bin/bash", "--login", "-c"] FROM base_build AS vcpkg_build # Build Tools - Mono --- -RUN yum-config-manager --add-repo http://download.mono-project.com/repo/centos/ && \ +RUN yum-config-manager --add-repo https://download.mono-project.com/repo/centos/ && \ yum clean all && \ yum makecache && \ - rpm --import "http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF" && \ + rpm --import "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF" && \ dnf config-manager --add-repo https://download.mono-project.com/repo/centos8-stable.repo && \ yum install -y mono-complete && \ yum -y clean all && rm -rf /var/cache diff --git a/dockerfiles/rockylinux-8.dockerfile b/dockerfiles/rockylinux-8.dockerfile index b7d059711feee1..65034ad80710da 100644 --- a/dockerfiles/rockylinux-8.dockerfile +++ b/dockerfiles/rockylinux-8.dockerfile @@ -14,6 +14,7 @@ RUN dnf install -y 'dnf-command(config-manager)' && \ libtool \ perl-IPC-Cmd \ python3 \ + rpm-build \ tar \ unzip \ zip && \ @@ -28,8 +29,8 @@ FROM base_build AS vcpkg_build # Build Tools - Mono --- RUN dnf install -y 'dnf-command(config-manager)' -RUN rpmkeys --import "http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF" && \ - dnf config-manager --add-repo http://download.mono-project.com/repo/centos8-stable/ && \ +RUN rpmkeys --import "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF" && \ + dnf config-manager --add-repo https://download.mono-project.com/repo/centos8-stable/ && \ dnf clean all && \ dnf makecache && \ dnf install -y mono-complete diff --git a/overlays/liblzma/add_support_ios.patch b/overlays/liblzma/add_support_ios.patch new file mode 100644 index 00000000000000..79741639b60a2b --- /dev/null +++ b/overlays/liblzma/add_support_ios.patch @@ -0,0 +1,20 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 52439b3..0b5e371 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -574,6 +574,7 @@ if(HAVE_GETOPT_LONG) + + install(TARGETS xzdec + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" ++ BUNDLE DESTINATION "${CMAKE_INSTALL_BINDIR}" + COMPONENT xzdec) + + if(UNIX) +@@ -701,6 +702,7 @@ if(NOT MSVC AND HAVE_GETOPT_LONG) + + install(TARGETS xz + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" ++ BUNDLE DESTINATION "${CMAKE_INSTALL_BINDIR}" + COMPONENT xz) + + if(UNIX) diff --git a/overlays/liblzma/build-tools.patch b/overlays/liblzma/build-tools.patch new file mode 100644 index 00000000000000..759345ef23afee --- /dev/null +++ b/overlays/liblzma/build-tools.patch @@ -0,0 +1,20 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 03b8301..820d08e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -584,6 +584,7 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/liblzma-config.cmake" + COMPONENT liblzma_Development) + + ++if(BUILD_TOOLS) + ############################################################################# + # getopt_long + ############################################################################# +@@ -793,6 +794,7 @@ if(NOT MSVC AND HAVE_GETOPT_LONG) + endforeach() + endif() + endif() ++endif() + + + ############################################################################# diff --git a/overlays/liblzma/fix_config_include.patch b/overlays/liblzma/fix_config_include.patch new file mode 100644 index 00000000000000..91dc4c13ba5435 --- /dev/null +++ b/overlays/liblzma/fix_config_include.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 34c6aca00..7b3708ab2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -413,6 +413,7 @@ if(WIN32) + if(BUILD_SHARED_LIBS) + # Add the Windows resource file for liblzma.dll. + target_sources(liblzma PRIVATE src/liblzma/liblzma_w32res.rc) ++ target_include_directories(liblzma PRIVATE windows/vs2019) + + set_target_properties(liblzma PROPERTIES + LINK_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/src/common/common_w32res.rc" diff --git a/overlays/liblzma/portfile.cmake b/overlays/liblzma/portfile.cmake new file mode 100644 index 00000000000000..c551658fe0cbe1 --- /dev/null +++ b/overlays/liblzma/portfile.cmake @@ -0,0 +1,86 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO xz-mirror/xz + REF "v${VERSION}" + SHA512 c28461123562564e030f3f733f078bc4c840e87598d9f4b718d4bca639120d8133f969c45d7bdc62f33f081d789ec0f14a1791fb7da18515682bfe3c0c7362e0 + HEAD_REF master + PATCHES + fix_config_include.patch + win_output_name.patch # Fix output name on Windows. Autotool build does not generate lib prefixed libraries on windows. + add_support_ios.patch # add install bundle info for support ios + build-tools.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tools BUILD_TOOLS +) + +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "wasm32") + set(WASM_OPTIONS -DCMAKE_C_BYTE_ORDER=LITTLE_ENDIAN -DCMAKE_CXX_BYTE_ORDER=LITTLE_ENDIAN) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + ${WASM_OPTIONS} + -DBUILD_TESTING=OFF + -DCREATE_XZ_SYMLINKS=OFF + -DCREATE_LZMA_SYMLINKS=OFF + -DCMAKE_MSVC_DEBUG_INFORMATION_FORMAT= # using flags from (vcpkg) toolchain + MAYBE_UNUSED_VARIABLES + CMAKE_MSVC_DEBUG_INFORMATION_FORMAT + CREATE_XZ_SYMLINKS + CREATE_LZMA_SYMLINKS +) +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +set(exec_prefix "\${prefix}") +set(libdir "\${prefix}/lib") +set(includedir "\${prefix}/include") +set(PACKAGE_URL https://tukaani.org/xz/) +set(PACKAGE_VERSION 5.4.3) +if(NOT VCPKG_TARGET_IS_WINDOWS) + set(PTHREAD_CFLAGS -pthread) +endif() +set(prefix "${CURRENT_INSTALLED_DIR}") +configure_file("${SOURCE_PATH}/src/liblzma/liblzma.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/liblzma.pc" @ONLY) +if (NOT VCPKG_BUILD_TYPE) + set(prefix "${CURRENT_INSTALLED_DIR}/debug") + configure_file("${SOURCE_PATH}/src/liblzma/liblzma.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/liblzma.pc" @ONLY) +endif() +vcpkg_fixup_pkgconfig() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/liblzma) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/lzma.h" "defined(LZMA_API_STATIC)" "1") +else() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/lzma.h" "defined(LZMA_API_STATIC)" "0") +endif() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/share/man" +) + +set(TOOLS xz xzdec) +foreach(_tool IN LISTS TOOLS) + if(NOT EXISTS "${CURRENT_PACKAGES_DIR}/bin/${_tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}") + list(REMOVE_ITEM TOOLS ${_tool}) + endif() +endforeach() +if(TOOLS) + vcpkg_copy_tools(TOOL_NAMES ${TOOLS} AUTO_CLEAN) +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/overlays/liblzma/usage b/overlays/liblzma/usage new file mode 100644 index 00000000000000..b1461c93fc0a9e --- /dev/null +++ b/overlays/liblzma/usage @@ -0,0 +1,9 @@ +liblzma is compatible with built-in CMake targets: + + find_package(LibLZMA REQUIRED) + target_link_libraries(main PRIVATE LibLZMA::LibLZMA) + +liblzma provides CMake targets: + + find_package(liblzma CONFIG REQUIRED) + target_link_libraries(main PRIVATE liblzma::liblzma) diff --git a/overlays/liblzma/vcpkg-cmake-wrapper.cmake b/overlays/liblzma/vcpkg-cmake-wrapper.cmake new file mode 100644 index 00000000000000..826cdba0650ba6 --- /dev/null +++ b/overlays/liblzma/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,64 @@ +cmake_policy(PUSH) +cmake_policy(SET CMP0012 NEW) +cmake_policy(SET CMP0057 NEW) +set(z_vcpkg_liblzma_fixup_needed 0) +if(NOT "CONFIG" IN_LIST ARGS AND NOT "NO_MODULE" IN_LIST ARGS AND NOT CMAKE_DISABLE_FIND_PACKAGE_LibLZMA) + get_filename_component(z_vcpkg_liblzma_prefix "${CMAKE_CURRENT_LIST_DIR}" DIRECTORY) + get_filename_component(z_vcpkg_liblzma_prefix "${z_vcpkg_liblzma_prefix}" DIRECTORY) + find_path(LIBLZMA_INCLUDE_DIR NAMES lzma.h PATHS "${z_vcpkg_liblzma_prefix}/include" NO_DEFAULT_PATH) + # liblzma doesn't use a debug postfix, but FindLibLZMA.cmake expects it + find_library(LIBLZMA_LIBRARY_RELEASE NAMES lzma PATHS "${z_vcpkg_liblzma_prefix}/lib" NO_DEFAULT_PATH) + find_library(LIBLZMA_LIBRARY_DEBUG NAMES lzma PATHS "${z_vcpkg_liblzma_prefix}/debug/lib" NO_DEFAULT_PATH) + unset(z_vcpkg_liblzma_prefix) + if(CMAKE_VERSION VERSION_LESS 3.16) + # Older versions of FindLibLZMA.cmake need a single lib in LIBLZMA_LIBRARY. + set(z_vcpkg_liblzma_fixup_needed 1) + set(LIBLZMA_LIBRARY "${LIBLZMA_LIBRARY_RELEASE}" CACHE INTERNAL "") + elseif(NOT TARGET LibLZMA::LibLZMA) + set(z_vcpkg_liblzma_fixup_needed 1) + endif() + # Known values, and required. Skip expensive tests. + set(LIBLZMA_HAS_AUTO_DECODER 1 CACHE INTERNAL "") + set(LIBLZMA_HAS_EASY_ENCODER 1 CACHE INTERNAL "") + set(LIBLZMA_HAS_LZMA_PRESET 1 CACHE INTERNAL "") +endif() + +_find_package(${ARGS}) + +if(z_vcpkg_liblzma_fixup_needed) + include(SelectLibraryConfigurations) + select_library_configurations(LIBLZMA) + if(NOT TARGET LibLZMA::LibLZMA) + # Backfill LibLZMA::LibLZMA to versions of cmake before 3.14 + add_library(LibLZMA::LibLZMA UNKNOWN IMPORTED) + if(DEFINED LIBLZMA_INCLUDE_DIRS) + set_target_properties(LibLZMA::LibLZMA PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${LIBLZMA_INCLUDE_DIRS}") + endif() + set_property(TARGET LibLZMA::LibLZMA APPEND PROPERTY + IMPORTED_CONFIGURATIONS RELEASE) + set_target_properties(LibLZMA::LibLZMA PROPERTIES + IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "C" + IMPORTED_LOCATION_RELEASE "${LIBLZMA_LIBRARY_RELEASE}") + if(EXISTS "${LIBLZMA_LIBRARY}") + set_target_properties(LibLZMA::LibLZMA PROPERTIES + IMPORTED_LINK_INTERFACE_LANGUAGES "C" + IMPORTED_LOCATION "${LIBLZMA_LIBRARY}") + endif() + endif() + if(LIBLZMA_LIBRARY_DEBUG) + # Backfill debug variant to versions of cmake before 3.16 + set_property(TARGET LibLZMA::LibLZMA APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) + set_target_properties(LibLZMA::LibLZMA PROPERTIES IMPORTED_LOCATION_DEBUG "${LIBLZMA_LIBRARY_DEBUG}") + endif() +endif() +if(LIBLZMA_LIBRARIES AND NOT "Threads::Threads" IN_LIST LIBLZMA_LIBRARIES) + set(THREADS_PREFER_PTHREAD_FLAG TRUE) + find_package(Threads) + list(APPEND LIBLZMA_LIBRARIES ${CMAKE_THREAD_LIBS_INIT}) + if(TARGET LibLZMA::LibLZMA) + set_property(TARGET LibLZMA::LibLZMA APPEND PROPERTY INTERFACE_LINK_LIBRARIES Threads::Threads) + endif() +endif() +unset(z_vcpkg_liblzma_fixup_needed) +cmake_policy(POP) diff --git a/overlays/liblzma/vcpkg.json b/overlays/liblzma/vcpkg.json new file mode 100644 index 00000000000000..327e5323803d92 --- /dev/null +++ b/overlays/liblzma/vcpkg.json @@ -0,0 +1,23 @@ +{ + "name": "liblzma", + "version": "5.4.4", + "description": "Compression library with an API similar to that of zlib.", + "homepage": "https://github.com/xz-mirror/xz", + "license": null, + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "tools": { + "description": "Build tools", + "supports": "!windows, mingw" + } + } +} \ No newline at end of file diff --git a/overlays/liblzma/win_output_name.patch b/overlays/liblzma/win_output_name.patch new file mode 100644 index 00000000000000..9a845bdbaef1d2 --- /dev/null +++ b/overlays/liblzma/win_output_name.patch @@ -0,0 +1,17 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0c6d4b7..62a824a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -868,8 +868,11 @@ set_target_properties(liblzma PROPERTIES + + # It's liblzma.so or liblzma.dll, not libliblzma.so or lzma.dll. + # Avoid the name lzma.dll because it would conflict with LZMA SDK. +- PREFIX "" ++ OUTPUT_NAME lzma + ) ++if(WIN32 AND NOT MINGW) ++ set_target_properties(liblzma PROPERTIES RUNTIME_OUTPUT_NAME liblzma) ++endif() + + # Create liblzma-config-version.cmake. + # diff --git a/overlays/nlp-engine/portfile.cmake b/overlays/nlp-engine/portfile.cmake index 130a9edc7fc328..ae931ff004c806 100644 --- a/overlays/nlp-engine/portfile.cmake +++ b/overlays/nlp-engine/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO VisualText/nlp-engine REF v${VERSION} - SHA512 d874bb29b405efbb5f988f4c5e08d9caa0afd1a2b7ec95a3d580095a89d703511b1a9deb9cf036e9b53e0416b307ec4b911bf5dafa2f6418faf36bb80effa40e + SHA512 a6871cb3db10a1d4bd7d5290141a82e788269da28b2d995963825dc4c50025e6099f5f872e4538054b7fb169773b6d6d3e73e3dd102bc3e0cbb5bddcd95ae484 HEAD_REF master ) diff --git a/overlays/nlp-engine/vcpkg.json b/overlays/nlp-engine/vcpkg.json index dd0a9866981a45..f58aab2fe7b738 100644 --- a/overlays/nlp-engine/vcpkg.json +++ b/overlays/nlp-engine/vcpkg.json @@ -1,6 +1,6 @@ { "name": "nlp-engine", - "version-semver": "2.8.15", + "version-semver": "2.10.6", "port-version": 0, "homepage": "https://github.com/VisualText/nlp-engine", "description": "The NLP engine is a cross-platform text analysis tool that can be accessed through a command line executable or by calling its C++ functions from another language.", diff --git a/overlays/opentelemetry-cpp/add-missing-find-dependency.patch b/overlays/opentelemetry-cpp/add-missing-find-dependency.patch deleted file mode 100644 index 1f9c12d1636026..00000000000000 --- a/overlays/opentelemetry-cpp/add-missing-find-dependency.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/cmake/opentelemetry-cpp-config.cmake.in b/cmake/opentelemetry-cpp-config.cmake.in -index adae58d..2642772 100644 ---- a/cmake/opentelemetry-cpp-config.cmake.in -+++ b/cmake/opentelemetry-cpp-config.cmake.in -@@ -69,6 +69,8 @@ set(OPENTELEMETRY_VERSION - # ############################################################################## - - find_package(Threads) -+include(CMakeFindDependencyMacro) -+find_dependency(absl) - - set_and_check(OPENTELEMETRY_CPP_INCLUDE_DIRS "@PACKAGE_INCLUDE_INSTALL_DIR@") - set_and_check(OPENTELEMETRY_CPP_LIBRARY_DIRS "@PACKAGE_CMAKE_INSTALL_LIBDIR@") diff --git a/overlays/opentelemetry-cpp/fix-nominmax-problems.patch b/overlays/opentelemetry-cpp/fix-nominmax-problems.patch deleted file mode 100644 index 7cf003711337ea..00000000000000 --- a/overlays/opentelemetry-cpp/fix-nominmax-problems.patch +++ /dev/null @@ -1,224 +0,0 @@ -diff --git a/api/include/opentelemetry/std/span.h b/api/include/opentelemetry/std/span.h -index 2a3dc12a84..1160d54fbe 100644 ---- a/api/include/opentelemetry/std/span.h -+++ b/api/include/opentelemetry/std/span.h -@@ -60,7 +60,7 @@ OPENTELEMETRY_END_NAMESPACE - OPENTELEMETRY_BEGIN_NAMESPACE - namespace nostd - { --constexpr std::size_t dynamic_extent = (std::numeric_limits::max()); -+constexpr std::size_t dynamic_extent = (std::numeric_limits::max)(); - - template - using span = std::span; -index 7deb369ab3..6da8bdd032 100644 ---- a/docs/cpp-ostream-exporter-design.md -+++ b/docs/cpp-ostream-exporter-design.md -@@ -154,7 +154,7 @@ public: - return sdktrace::ExportResult::kSuccess; - } - -- bool Shutdown(std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept -+ bool Shutdown(std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept - { - isShutdown = true; - return true; -diff --git a/exporters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_record_exporter.h b/exporters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_record_exporter.h -index 8579c99138..b72ff4f917 100644 ---- a/exporters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_record_exporter.h -+++ b/exporters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_record_exporter.h -@@ -100,14 +100,14 @@ class ElasticsearchLogRecordExporter final : public opentelemetry::sdk::logs::Lo - * @return return true when all data are exported, and false when timeout - */ - bool ForceFlush( -- std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override; -+ std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override; - - /** - * Shutdown this exporter. - * @param timeout The maximum time to wait for the shutdown method to return - */ - bool Shutdown( -- std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override; -+ std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override; - - private: - // Stores if this exporter had its Shutdown() method called -diff --git a/exporters/elasticsearch/src/es_log_record_exporter.cc b/exporters/elasticsearch/src/es_log_record_exporter.cc -index c90072e4e4..e167faf3d9 100644 ---- a/exporters/elasticsearch/src/es_log_record_exporter.cc -+++ b/exporters/elasticsearch/src/es_log_record_exporter.cc -@@ -430,7 +430,7 @@ bool ElasticsearchLogRecordExporter::ForceFlush( - std::chrono::duration_cast(timeout); - if (timeout_steady <= std::chrono::steady_clock::duration::zero()) - { -- timeout_steady = std::chrono::steady_clock::duration::max(); -+ timeout_steady = (std::chrono::steady_clock::duration::max)(); - } - - std::unique_lock lk_cv(synchronization_data_->force_flush_cv_m); -diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_exporter.h b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_exporter.h -index 7aff1e24a5..870e5a043a 100644 ---- a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_exporter.h -+++ b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_exporter.h -@@ -58,7 +58,7 @@ class OtlpGrpcExporter final : public opentelemetry::sdk::trace::SpanExporter - * @return return true when all data are exported, and false when timeout - */ - bool ForceFlush( -- std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override; -+ std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override; - - /** - * Shut down the exporter. -@@ -67,7 +67,7 @@ class OtlpGrpcExporter final : public opentelemetry::sdk::trace::SpanExporter - * @return return the status of this operation - */ - bool Shutdown( -- std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override; -+ std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override; - - private: - // The configuration options associated with this exporter. -diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter.h b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter.h -index 29333703b1..f1cd96888c 100644 ---- a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter.h -+++ b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter.h -@@ -60,14 +60,14 @@ class OtlpGrpcLogRecordExporter : public opentelemetry::sdk::logs::LogRecordExpo - * @return return true when all data are exported, and false when timeout - */ - bool ForceFlush( -- std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override; -+ std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override; - - /** - * Shutdown this exporter. - * @param timeout The maximum time to wait for the shutdown method to return. - */ - bool Shutdown( -- std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override; -+ std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override; - - private: - // Configuration options for the exporter -diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_exporter.h b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_exporter.h -index 1adbbc70b9..b5faf1a9b8 100644 ---- a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_exporter.h -+++ b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_exporter.h -@@ -59,7 +59,7 @@ class OPENTELEMETRY_EXPORT OtlpHttpExporter final : public opentelemetry::sdk::t - * @return return true when all data are exported, and false when timeout - */ - bool ForceFlush( -- std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override; -+ std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override; - - /** - * Shut down the exporter. -@@ -68,7 +68,7 @@ class OPENTELEMETRY_EXPORT OtlpHttpExporter final : public opentelemetry::sdk::t - * @return return the status of this operation - */ - bool Shutdown( -- std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override; -+ std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override; - - private: - // The configuration options associated with this exporter. -diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_log_record_exporter.h b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_log_record_exporter.h -index 4393345dfd..f481fdab0b 100644 ---- a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_log_record_exporter.h -+++ b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_log_record_exporter.h -@@ -58,14 +58,14 @@ class OtlpHttpLogRecordExporter final : public opentelemetry::sdk::logs::LogReco - * @return return true when all data are exported, and false when timeout - */ - bool ForceFlush( -- std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override; -+ std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override; - - /** - * Shutdown this exporter. - * @param timeout The maximum time to wait for the shutdown method to return - */ - bool Shutdown( -- std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override; -+ std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override; - - private: - // Configuration options for the exporter -diff --git a/exporters/otlp/src/otlp_http_client.cc b/exporters/otlp/src/otlp_http_client.cc -index 9c57a9bd83..7814199ef2 100644 ---- a/exporters/otlp/src/otlp_http_client.cc -+++ b/exporters/otlp/src/otlp_http_client.cc -@@ -782,7 +782,7 @@ bool OtlpHttpClient::ForceFlush(std::chrono::microseconds timeout) noexcept - std::chrono::duration_cast(timeout); - if (timeout_steady <= std::chrono::steady_clock::duration::zero()) - { -- timeout_steady = std::chrono::steady_clock::duration::max(); -+ timeout_steady = (std::chrono::steady_clock::duration::max)(); - } - - while (timeout_steady > std::chrono::steady_clock::duration::zero()) -diff --git a/sdk/include/opentelemetry/sdk/logs/batch_log_record_processor.h b/sdk/include/opentelemetry/sdk/logs/batch_log_record_processor.h -index e93ebf3d6b..d6a44df142 100644 ---- a/sdk/include/opentelemetry/sdk/logs/batch_log_record_processor.h -+++ b/sdk/include/opentelemetry/sdk/logs/batch_log_record_processor.h -@@ -72,7 +72,7 @@ class BatchLogRecordProcessor : public LogRecordProcessor - * NOTE: Timeout functionality not supported yet. - */ - bool ForceFlush( -- std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override; -+ std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override; - - /** - * Shuts down the processor and does any cleanup required. Completely drains the buffer/queue of -@@ -82,7 +82,7 @@ class BatchLogRecordProcessor : public LogRecordProcessor - * NOTE: Timeout functionality not supported yet. - */ - bool Shutdown( -- std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override; -+ std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override; - - /** - * Class destructor which invokes the Shutdown() method. -diff --git a/sdk/include/opentelemetry/sdk/logs/multi_log_record_processor.h b/sdk/include/opentelemetry/sdk/logs/multi_log_record_processor.h -index 335da7f668..8ca5cffcca 100644 ---- a/sdk/include/opentelemetry/sdk/logs/multi_log_record_processor.h -+++ b/sdk/include/opentelemetry/sdk/logs/multi_log_record_processor.h -@@ -45,7 +45,7 @@ class MultiLogRecordProcessor : public LogRecordProcessor - * @return a result code indicating whether it succeeded, failed or timed out - */ - bool ForceFlush( -- std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override; -+ std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override; - - /** - * Shuts down the processor and does any cleanup required. -@@ -55,7 +55,7 @@ class MultiLogRecordProcessor : public LogRecordProcessor - * @return true if the shutdown succeeded, false otherwise - */ - bool Shutdown( -- std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override; -+ std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override; - - private: - std::vector> processors_; -diff --git a/sdk/include/opentelemetry/sdk/trace/batch_span_processor.h b/sdk/include/opentelemetry/sdk/trace/batch_span_processor.h -index a748b06361..afbf4486b0 100644 ---- a/sdk/include/opentelemetry/sdk/trace/batch_span_processor.h -+++ b/sdk/include/opentelemetry/sdk/trace/batch_span_processor.h -@@ -69,7 +69,7 @@ class BatchSpanProcessor : public SpanProcessor - * NOTE: Timeout functionality not supported yet. - */ - bool ForceFlush( -- std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override; -+ std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override; - - /** - * Shuts down the processor and does any cleanup required. Completely drains the buffer/queue of -@@ -79,7 +79,7 @@ class BatchSpanProcessor : public SpanProcessor - * NOTE: Timeout functionality not supported yet. - */ - bool Shutdown( -- std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override; -+ std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override; - - /** - * Class destructor which invokes the Shutdown() method. The Shutdown() method is supposed to be diff --git a/overlays/opentelemetry-cpp/hpcc-remove-unsafe-onfork.patch b/overlays/opentelemetry-cpp/hpcc-remove-unsafe-onfork.patch deleted file mode 100644 index b9a0a16725a7a3..00000000000000 --- a/overlays/opentelemetry-cpp/hpcc-remove-unsafe-onfork.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff --git a/sdk/src/common/random.cc b/sdk/src/common/random.cc -index 77b88cfa..14e94d0c 100644 ---- a/sdk/src/common/random.cc -+++ b/sdk/src/common/random.cc -@@ -13,11 +13,10 @@ namespace sdk - { - namespace common - { --// Wraps a thread_local random number generator, but adds a fork handler so that --// the generator will be correctly seeded after forking. --// --// See https://stackoverflow.com/q/51882689/4447365 and --// https://github.com/opentracing-contrib/nginx-opentracing/issues/52 -+// Wraps a thread_local random number generator. -+// The previous fork handler is removed because it was not safe and was solving a problem that did -+// not need to be solved since there should be no logic in the child() before it calls exec(). -+ - namespace - { - class TlsRandomNumberGenerator -@@ -26,17 +25,14 @@ class TlsRandomNumberGenerator - TlsRandomNumberGenerator() noexcept - { - Seed(); -- platform::AtFork(nullptr, nullptr, OnFork); - } - -- static FastRandomNumberGenerator &engine() noexcept { return engine_; } -+ FastRandomNumberGenerator & engine() noexcept { return engine_; } - - private: -- static thread_local FastRandomNumberGenerator engine_; -- -- static void OnFork() noexcept { Seed(); } -+ FastRandomNumberGenerator engine_; - -- static void Seed() noexcept -+ void Seed() noexcept - { - std::random_device random_device; - std::seed_seq seed_seq{random_device(), random_device(), random_device(), random_device()}; -@@ -44,13 +40,12 @@ class TlsRandomNumberGenerator - } - }; - --thread_local FastRandomNumberGenerator TlsRandomNumberGenerator::engine_{}; - } // namespace - - FastRandomNumberGenerator &Random::GetRandomNumberGenerator() noexcept - { - static thread_local TlsRandomNumberGenerator random_number_generator{}; -- return TlsRandomNumberGenerator::engine(); -+ return random_number_generator.engine(); - } - - uint64_t Random::GenerateRandom64() noexcept diff --git a/overlays/opentelemetry-cpp/portfile.cmake b/overlays/opentelemetry-cpp/portfile.cmake deleted file mode 100644 index 127a18e4df2f17..00000000000000 --- a/overlays/opentelemetry-cpp/portfile.cmake +++ /dev/null @@ -1,83 +0,0 @@ -if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -endif() - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO open-telemetry/opentelemetry-cpp - REF "v${VERSION}" - SHA512 38a3796a5f4c28fd54cc2a5475b3a024e2e73594acbc635fccc6358bf4d93ae897fc0ce55a93d27736a08622869ccc9fe9a9ee62e3884adadb3f135c27d378ec - HEAD_REF main - PATCHES - # Missing find_dependency for Abseil - add-missing-find-dependency.patch - # Fix problems from removing NOMINMAX on Windows. Fixed in 1.14.0 - fix-nominmax-problems.patch - # HPCC-fix: Remove code that reinitialised the random number generator on fork() - hpcc-remove-unsafe-onfork.patch -) - -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - etw WITH_ETW - zipkin WITH_ZIPKIN - prometheus WITH_PROMETHEUS - elasticsearch WITH_ELASTICSEARCH - otlp-http WITH_OTLP_HTTP - otlp-grpc WITH_OTLP_GRPC - geneva WITH_GENEVA -) - -# opentelemetry-proto is a third party submodule and opentelemetry-cpp release did not pack it. -if(WITH_OTLP_GRPC OR WITH_OTLP_HTTP) - set(OTEL_PROTO_VERSION "1.0.0") - vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/open-telemetry/opentelemetry-proto/archive/v${OTEL_PROTO_VERSION}.tar.gz" - FILENAME "opentelemetry-proto-${OTEL_PROTO_VERSION}.tar.gz" - SHA512 74de78304a91fe72cfcdbd87fcb19c0d6338c161d6624ce09eac0527b1b43b8a5d8790ae055e1d3d44319eaa070a506f47e740f888c91d724a0aef8b509688f0 - ) - - vcpkg_extract_source_archive(src ARCHIVE "${ARCHIVE}") - file(REMOVE_RECURSE "${SOURCE_PATH}/third_party/opentelemetry-proto") - file(COPY "${src}/." DESTINATION "${SOURCE_PATH}/third_party/opentelemetry-proto") - # Create empty .git directory to prevent opentelemetry from cloning it during build time - file(MAKE_DIRECTORY "${SOURCE_PATH}/third_party/opentelemetry-proto/.git") - list(APPEND FEATURE_OPTIONS -DCMAKE_CXX_STANDARD=14) - list(APPEND FEATURE_OPTIONS "-DgRPC_CPP_PLUGIN_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/grpc/grpc_cpp_plugin${VCPKG_HOST_EXECUTABLE_SUFFIX}") -endif() - -set(OPENTELEMETRY_CPP_EXTERNAL_COMPONENTS "OFF") -if(WITH_GENEVA) -# Geneva exporters from opentelemetry-cpp-contrib are tightly coupled with opentelemetry-cpp repo, so they should be ported as a feature under opentelemetry-cpp. -# TODO: merge the opentelemetry-fluentd port to opentelemery-cpp port. - vcpkg_from_github( - OUT_SOURCE_PATH CONTRIB_SOURCE_PATH - REPO open-telemetry/opentelemetry-cpp-contrib - REF 26e5ed48d81bb03fde52848ab394605dde0fb1a8 - HEAD_REF main - SHA512 f483dc96a884450fbb17fdaf0b5514ba44546f1742c2f80f552fcb442e08fbfe399441594e95ffd2c644c20907baef83d52c326dd6d3d5eb70cf29d30b2c5a0e - ) - set(OPENTELEMETRY_CPP_EXTERNAL_COMPONENTS "") - list(APPEND OPENTELEMETRY_CPP_EXTERNAL_COMPONENTS "${CONTRIB_SOURCE_PATH}/exporters/geneva") -endif() - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DBUILD_TESTING=OFF - -DWITH_EXAMPLES=OFF - -DOPENTELEMETRY_INSTALL=ON - -DWITH_ABSEIL=ON - -DOPENTELEMETRY_EXTERNAL_COMPONENT_PATH="${OPENTELEMETRY_CPP_EXTERNAL_COMPONENTS}" - ${FEATURE_OPTIONS} - MAYBE_UNUSED_VARIABLES - WITH_GENEVA -) - -vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") -vcpkg_copy_pdbs() - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/overlays/opentelemetry-cpp/vcpkg.json b/overlays/opentelemetry-cpp/vcpkg.json deleted file mode 100644 index dda8cae1a3c184..00000000000000 --- a/overlays/opentelemetry-cpp/vcpkg.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", - "name": "opentelemetry-cpp", - "version-semver": "1.13.0", - "port-version": 4, - "description": [ - "OpenTelemetry is a collection of tools, APIs, and SDKs.", - "You use it to instrument, generate, collect, and export telemetry data (metrics, logs, and traces) for analysis in order to understand your software's performance and behavior." - ], - "homepage": "https://github.com/open-telemetry/opentelemetry-cpp", - "license": "Apache-2.0", - "dependencies": [ - "abseil", - "nlohmann-json", - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ], - "features": { - "elasticsearch": { - "description": "Whether to include the Elasticsearch Client in the SDK" - }, - "etw": { - "description": "Whether to include the ETW Exporter in the SDK", - "supports": "windows" - }, - "geneva": { - "description": "Whether to include the Geneva Exporter from the opentelemetry-cpp-contrib repository" - }, - "otlp-grpc": { - "description": "Whether to include the OTLP gRPC exporter in the SDK", - "dependencies": [ - "grpc", - { - "name": "grpc", - "host": true - } - ] - }, - "otlp-http": { - "description": "Whether to include the OpenTelemetry Protocol over HTTP in the SDK", - "dependencies": [ - "curl", - "protobuf" - ] - }, - "prometheus": { - "description": "Whether to include the Prometheus Client in the SDK", - "dependencies": [ - "prometheus-cpp" - ] - }, - "zipkin": { - "description": "Whether to include the Zipkin exporter in the SDK" - } - } -} diff --git a/overlays/overlay_changelog_9.8.0 b/overlays/overlay_changelog_9.8.0 new file mode 100644 index 00000000000000..3a19b042d445e2 --- /dev/null +++ b/overlays/overlay_changelog_9.8.0 @@ -0,0 +1,7 @@ +Delete pcre2 overlay - ports/pcre2 microsoft 2024.05.24 set to same version +delete libmysql - equivalent version found in ports/ +delete libxml - might have to revert - higher version in ports/ +delete libxslt - equivalent version found in ports/ +delete opentelemetry-cpp - Update version in ports/ + +fix for boost-math - update baseline to 0151c07c081dba20642f7a580c814afc629d1970 diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json index 8c566b7c814a0b..4e039b304d740f 100644 --- a/vcpkg-configuration.json +++ b/vcpkg-configuration.json @@ -2,7 +2,7 @@ "default-registry": { "kind": "git", "repository": "https://github.com/microsoft/vcpkg", - "baseline": "fba75d09065fcc76a25dcf386b1d00d33f5175af" + "baseline": "0151c07c081dba20642f7a580c814afc629d1970" }, "registries": [], "overlay-ports": [ diff --git a/vcpkg.json b/vcpkg.json index 11997256611a2e..4591ff9e6cc143 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,7 +1,7 @@ { "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json", "name": "hpcc-platform", - "version": "9.2.0", + "version": "9.8.0", "dependencies": [ "apr", "apr-util",