fix: elasticlient dependencies require cxx 17

Bump gcc version to 11 Signed-off-by: Gordon Smith <[email protected]>
hpcc-systems · Jun 27, 2023 · 6804a2e · 6804a2e
1 parent 3d94e6b
commit 6804a2e
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 12 deletions.
diff --git a/dockerfiles/amazonlinux.dockerfile b/dockerfiles/amazonlinux.dockerfile
@@ -24,7 +24,7 @@ RUN yum-config-manager --add-repo http://mirror.centos.org/centos/7/sclo/x86_64/
     LIBGFORTRAN5=libgfortran5-8.3.1-2.1.1.el7.x86_64.rpm && \
     wget http://mirror.centos.org/centos/7/os/x86_64/Packages/${LIBGFORTRAN5} && \
     yum install -y ${LIBGFORTRAN5} && \
-    yum install -y devtoolset-9 --nogpgcheck
+    yum install -y devtoolset-11 --nogpgcheck
 
 RUN yum install -y hostname xz && \
     curl -o pkg-config-0.29.2.tar.gz https://pkg-config.freedesktop.org/releases/pkg-config-0.29.2.tar.gz && \
@@ -92,7 +92,7 @@ RUN ln -s /usr/local/libtool/2_4_6/bin/libtool /usr/local/bin/ && \
 # ldconfig
 # ldconfig -v
 
-RUN echo "source /opt/rh/devtoolset-9/enable" > /etc/profile.d/devtoolset-9.sh
+RUN echo "source /opt/rh/devtoolset-11/enable" > /etc/profile.d/devtoolset-11.sh
 SHELL ["/bin/bash", "--login", "-c"]
 
 FROM base_build AS vcpkg_build

diff --git a/dockerfiles/centos-7.dockerfile b/dockerfiles/centos-7.dockerfile
@@ -19,9 +19,9 @@ RUN yum update -y && yum install -y \
     yum-utils \
     zip 
 
-RUN yum install -y devtoolset-9  devtoolset-11
+RUN yum install -y devtoolset-11
 
-RUN echo "source /opt/rh/devtoolset-9/enable" >> /etc/bashrc
+RUN echo "source /opt/rh/devtoolset-11/enable" >> /etc/bashrc
 SHELL ["/bin/bash", "--login", "-c"]
 
 RUN curl -o pkg-config-0.29.2.tar.gz https://pkg-config.freedesktop.org/releases/pkg-config-0.29.2.tar.gz && \

diff --git a/dockerfiles/centos-8.dockerfile b/dockerfiles/centos-8.dockerfile
@@ -16,9 +16,9 @@ RUN yum update -y && yum install -y dnf-plugins-core && \
     yum-utils \
     zip 
 
-RUN yum -y install gcc-toolset-9-gcc gcc-toolset-9-gcc-c++ gcc-toolset-11-gcc gcc-toolset-11-gcc-c++
+RUN yum -y install gcc-toolset-11-gcc gcc-toolset-11-gcc-c++
 
-RUN echo "source /opt/rh/gcc-toolset-9/enable" >> /etc/bashrc
+RUN echo "source /opt/rh/gcc-toolset-11/enable" >> /etc/bashrc
 SHELL ["/bin/bash", "--login", "-c"]
 
 FROM base_build AS vcpkg_build

diff --git a/overlays/elasticlient/portfile.cmake b/overlays/elasticlient/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
-    REPO seznam/elasticlient
-    REF d68e30e382b5f2817be8cd901494736b26d4896e
-    SHA512 703b13cfd4346de934ace6d62e2bd5d0bfec3c06c1061b842c1477ce260a816ec8a128b337c91a1cf4e79aca7c73d28d591c56d4c725ee3b77a7cb1c2bee4663
+    REPO hpcc-systems/elasticlient
+    REF 822af26dd087eff1267fbb8868845a073bf2b1e3
+    SHA512 4f73202b2c289924c97ac85e74c7b63ae2d21c24e8c2932bc346a480f9c61f29e47df72d366f82477cc6235b7861dac64568fead0159514c273625ebf1929cfe
     HEAD_REF master
 )
 

diff --git a/overlays/elasticlient/vcpkg.json b/overlays/elasticlient/vcpkg.json
@@ -1,7 +1,8 @@
 {
   "name": "elasticlient",
-  "version-semver": "0.2.1",
-  "homepage": "https://github.com/seznam/elasticlient",
+  "version-semver": "0.2.2",
+  "port-version": 0,
+  "homepage": "https://github.com/hpcc-systems/elasticlient",
   "description": "C++ elasticlient library is simple library for simplified work with Elasticsearch in C++. The library is based on C++ Requests: Curl for People.",
   "supports": "!windows",
   "dependencies": [

diff --git a/vcpkg.json b/vcpkg.json
@@ -18,6 +18,7 @@
         "boost-property-tree",
         "boost-regex",
         "cpp-driver",
+        "cppunit",
         "cpr",
         "curl",
         {
@@ -42,7 +43,6 @@
             ]
         },
         "libcouchbase-cxx",
-        "libevent",
         "libgit2",
         {
             "name": "libiconv",
@@ -66,6 +66,7 @@
         },
         "libyaml",
         "lz4",
+        "minizip",
         "mongo-cxx-driver",
         "nlohmann-json",
         "nlp-engine",