chore: Squash commits for 9.8.0 gold release

Signed-off-by: Gordon Smith <GordonJSmith@gmail.com>
hpcc-systems · Jun 19, 2024 · b9e6d5e · b9e6d5e
1 parent 3e9ec64
commit b9e6d5e
Show file tree

Hide file tree

Showing 29 changed files with 1,107 additions and 252 deletions.
diff --git a/.github/workflows/prebuild-gh_envs.yml b/.github/workflows/prebuild-gh_envs.yml
@@ -143,6 +143,7 @@ jobs:
         run: |
           ./vcpkg install \
             --x-abi-tools-use-exact-versions \
+            --host-triplet=${{ matrix.triplet }} \
             --triplet=${{ matrix.triplet }}
 
       - name: Upload error logs

diff --git a/dockerfiles/amazonlinux.dockerfile b/dockerfiles/amazonlinux.dockerfile
@@ -133,6 +133,7 @@ RUN mkdir /hpcc-dev/build
 RUN ./vcpkg install \
     --x-abi-tools-use-exact-versions \
     --x-install-root=/hpcc-dev/build/vcpkg_installed \
+    --host-triplet=x64-amazonlinux-dynamic \
     --triplet=x64-amazonlinux-dynamic
 # ./vcpkg install --x-abi-tools-use-exact-versions --triplet=x64-amazonlinux-dynamic --x-install-root=/hpcc-dev/build/vcpkg_installed
 

diff --git a/dockerfiles/centos-7.dockerfile b/dockerfiles/centos-7.dockerfile
@@ -127,6 +127,7 @@ RUN mkdir /hpcc-dev/build
 RUN ./vcpkg install \
     --x-abi-tools-use-exact-versions \
     --x-install-root=/hpcc-dev/build/vcpkg_installed \
+    --host-triplet=x64-centos-7-dynamic \
     --triplet=x64-centos-7-dynamic
 # ./vcpkg install --x-abi-tools-use-exact-versions --x-install-root=/hpcc-dev/build/vcpkg_installed --triplet=x64-centos-7-dynamic
 

diff --git a/dockerfiles/centos-8.dockerfile b/dockerfiles/centos-8.dockerfile
@@ -64,6 +64,7 @@ RUN mkdir /hpcc-dev/build
 RUN ./vcpkg install \
     --x-abi-tools-use-exact-versions \
     --x-install-root=/hpcc-dev/build/vcpkg_installed \
+    --host-triplet=x64-linux-dynamic \
     --triplet=x64-linux-dynamic
 # ./vcpkg install --x-abi-tools-use-exact-versions --x-install-root=/hpcc-dev/build/vcpkg_installed --triplet=x64-linux-dynamic
 

diff --git a/dockerfiles/rockylinux-8.dockerfile b/dockerfiles/rockylinux-8.dockerfile
@@ -63,6 +63,7 @@ RUN mkdir /hpcc-dev/build
 RUN ./vcpkg install \
     --x-abi-tools-use-exact-versions \
     --x-install-root=/hpcc-dev/build/vcpkg_installed \
+    --host-triplet=x64-linux-dynamic \
     --triplet=x64-linux-dynamic
 # ./vcpkg install --x-abi-tools-use-exact-versions --x-install-root=/hpcc-dev/build/vcpkg_installed --triplet=x64-linux-dynamic
 

diff --git a/dockerfiles/ubuntu-20.04.dockerfile b/dockerfiles/ubuntu-20.04.dockerfile
@@ -62,6 +62,7 @@ RUN mkdir /hpcc-dev/build
 RUN ./vcpkg install \
     --x-abi-tools-use-exact-versions \
     --x-install-root=/hpcc-dev/build/vcpkg_installed \
+    --host-triplet=x64-linux-dynamic \
     --triplet=x64-linux-dynamic
 # ./vcpkg install --x-abi-tools-use-exact-versions --triplet=x64-linux-dynamic --x-install-root=/hpcc-dev/build/vcpkg_installed
 

diff --git a/dockerfiles/ubuntu-22.04.dockerfile b/dockerfiles/ubuntu-22.04.dockerfile
@@ -62,8 +62,9 @@ RUN mkdir /hpcc-dev/build
 RUN ./vcpkg install \
     --x-abi-tools-use-exact-versions \
     --x-install-root=/hpcc-dev/build/vcpkg_installed \
+    --host-triplet=x64-linux-dynamic \
     --triplet=x64-linux-dynamic
-# ./vcpkg install --x-abi-tools-use-exact-versions --triplet=x64-linux-dynamic --x-install-root=/hpcc-dev/build/vcpkg_installed
+# ./vcpkg install --x-abi-tools-use-exact-versions --host-triplet=x64-linux-dynamic --triplet=x64-linux-dynamic --x-install-root=/hpcc-dev/build/vcpkg_installed
 
 RUN mkdir -p /hpcc-dev/tools/cmake
 RUN cp -r $(dirname $(dirname `./vcpkg fetch cmake | tail -n 1`))/* /hpcc-dev/tools/cmake

diff --git a/dockerfiles/ubuntu-24.04.dockerfile b/dockerfiles/ubuntu-24.04.dockerfile
@@ -59,6 +59,7 @@ RUN mkdir /hpcc-dev/build
 RUN ./vcpkg install \
     --x-abi-tools-use-exact-versions \
     --x-install-root=/hpcc-dev/build/vcpkg_installed \
+    --host-triplet=x64-linux-dynamic \
     --triplet=x64-linux-dynamic
 # ./vcpkg install --x-abi-tools-use-exact-versions --triplet=x64-linux-dynamic --x-install-root=/hpcc-dev/build/vcpkg_installed
 

diff --git a/overlays/liblzma/add_support_ios.patch b/overlays/liblzma/add_support_ios.patch
diff --git a/overlays/liblzma/build-tools.patch b/overlays/liblzma/build-tools.patch
diff --git a/overlays/liblzma/fix_config_include.patch b/overlays/liblzma/fix_config_include.patch
diff --git a/overlays/liblzma/portfile.cmake b/overlays/liblzma/portfile.cmake
diff --git a/overlays/liblzma/usage b/overlays/liblzma/usage
diff --git a/overlays/liblzma/vcpkg-cmake-wrapper.cmake b/overlays/liblzma/vcpkg-cmake-wrapper.cmake
diff --git a/overlays/liblzma/vcpkg.json b/overlays/liblzma/vcpkg.json
diff --git a/overlays/liblzma/win_output_name.patch b/overlays/liblzma/win_output_name.patch