From f87d135cf9ddd3efb4830e5cdb80dcb301da0ef2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Fri, 3 Dec 2021 11:54:47 +0800 Subject: [PATCH] [influxdb-cxx] Fix build error, fix usage (#21813) * [influxdb-cxx] Fix build error, fix usage * version --- ports/influxdb-cxx/include-stringview.patch | 12 ++++++++++++ ports/influxdb-cxx/portfile.cmake | 3 ++- ports/influxdb-cxx/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/i-/influxdb-cxx.json | 5 +++++ 5 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 ports/influxdb-cxx/include-stringview.patch diff --git a/ports/influxdb-cxx/include-stringview.patch b/ports/influxdb-cxx/include-stringview.patch new file mode 100644 index 0000000000..a44563506e --- /dev/null +++ b/ports/influxdb-cxx/include-stringview.patch @@ -0,0 +1,12 @@ +diff --git a/src/Point.cxx b/src/Point.cxx +index 8f7fc10..95b119e 100644 +--- a/src/Point.cxx ++++ b/src/Point.cxx +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + + namespace influxdb + { diff --git a/ports/influxdb-cxx/portfile.cmake b/ports/influxdb-cxx/portfile.cmake index e666277a79..5498788ecd 100644 --- a/ports/influxdb-cxx/portfile.cmake +++ b/ports/influxdb-cxx/portfile.cmake @@ -4,6 +4,7 @@ vcpkg_from_github( REF v0.6.7 SHA512 4e871c6d06c94b24b45aeedb7c74c75aed17332fbde76fc1e6c2ad06aeb41e268a95f4cab1c12c4402765c11811feb84bf48d60b138717c485327848782e402c HEAD_REF master + PATCHES include-stringview.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -23,6 +24,6 @@ vcpkg_cmake_install() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake) +vcpkg_cmake_config_fixup(PACKAGE_NAME InfluxDB CONFIG_PATH lib/cmake/InfluxDB) file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/influxdb-cxx/vcpkg.json b/ports/influxdb-cxx/vcpkg.json index 59724c89ae..1666fc558c 100644 --- a/ports/influxdb-cxx/vcpkg.json +++ b/ports/influxdb-cxx/vcpkg.json @@ -1,6 +1,7 @@ { "name": "influxdb-cxx", "version": "0.6.7", + "port-version": 1, "description": "InfluxDB C++ client library", "homepage": "https://github.com/offa/influxdb-cxx", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index c3ede9abaf..76c4c9321e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2862,7 +2862,7 @@ }, "influxdb-cxx": { "baseline": "0.6.7", - "port-version": 0 + "port-version": 1 }, "infoware": { "baseline": "2021-06-16", diff --git a/versions/i-/influxdb-cxx.json b/versions/i-/influxdb-cxx.json index d4e9ce4c0e..310b08ecbd 100644 --- a/versions/i-/influxdb-cxx.json +++ b/versions/i-/influxdb-cxx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9403a6547a2dbd42b86d686c2ecd7a3e7344f13a", + "version": "0.6.7", + "port-version": 1 + }, { "git-tree": "ddcc844c034b136efc1bd9946e37fb98617acd88", "version": "0.6.7",