This is an automated email from the ASF dual-hosted git repository.
philo pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-gluten.git
The following commit(s) were added to refs/heads/main by this push:
new b94afa66f [VL] Fix gcs build issue when vcpkg build is enabled (#6343)
b94afa66f is described below
commit b94afa66f3514953b95a2297081d0b0e588f39bf
Author: PHILO-HE <[email protected]>
AuthorDate: Fri Jul 5 21:20:18 2024 +0800
[VL] Fix gcs build issue when vcpkg build is enabled (#6343)
---
dev/ci-velox-buildstatic.sh | 2 +-
dev/vcpkg/vcpkg-configuration.json | 9 ++++++++-
dev/vcpkg/vcpkg.json | 3 ++-
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/dev/ci-velox-buildstatic.sh b/dev/ci-velox-buildstatic.sh
index 74688ff30..227bad360 100755
--- a/dev/ci-velox-buildstatic.sh
+++ b/dev/ci-velox-buildstatic.sh
@@ -6,4 +6,4 @@ cd $GITHUB_WORKSPACE/
source ./dev/vcpkg/env.sh
sed -i '/^headers/d' ep/build-velox/build/velox_ep/CMakeLists.txt
export NUM_THREADS=4
-./dev/builddeps-veloxbe.sh --build_tests=OFF --build_benchmarks=OFF
--enable_s3=ON --enable_gcs=OFF --enable_hdfs=ON --enable_abfs=ON
+./dev/builddeps-veloxbe.sh --build_tests=OFF --build_benchmarks=OFF
--enable_s3=ON --enable_gcs=ON --enable_hdfs=ON --enable_abfs=ON
diff --git a/dev/vcpkg/vcpkg-configuration.json
b/dev/vcpkg/vcpkg-configuration.json
index ab9038467..dcbbb75b7 100644
--- a/dev/vcpkg/vcpkg-configuration.json
+++ b/dev/vcpkg/vcpkg-configuration.json
@@ -8,6 +8,13 @@
"repository": "https://github.com/Microsoft/vcpkg";,
"baseline": "8ccb84df727bdf83045e53c319af05c554838b80",
"packages": [ "boost*", "boost-*"]
+ },
+ {
+ "kind": "git",
+ "repository": "https://github.com/Microsoft/vcpkg";,
+ "baseline": "f82160a747b1b529daad7ce2f75a0d6c6a0d285d",
+ "packages": [ "google-cloud-cpp"]
}
+
]
-}
\ No newline at end of file
+}
diff --git a/dev/vcpkg/vcpkg.json b/dev/vcpkg/vcpkg.json
index b7dcb059c..6eec2190d 100644
--- a/dev/vcpkg/vcpkg.json
+++ b/dev/vcpkg/vcpkg.json
@@ -76,7 +76,8 @@
"name": "google-cloud-cpp",
"features": [
"storage"
- ]
+ ],
+ "version>=": "2.22.0"
}
]
},
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
