baibaichen commented on code in PR #12625:
URL: https://github.com/apache/gluten/pull/12625#discussion_r3649929510
##########
cpp/velox/CMakeLists.txt:
##########
@@ -443,8 +466,8 @@ if(DEFINED VCPKG_INSTALLED_DIR
)
target_link_libraries(
velox
- PRIVATE ${VCPKG_INSTALLED_DIR}/${VCPKG_TRIPLET_DIR}/lib/libthriftcpp2.a
-
${VCPKG_INSTALLED_DIR}/${VCPKG_TRIPLET_DIR}/lib/libthriftprotocol.a)
+ PUBLIC ${VCPKG_INSTALLED_DIR}/${VCPKG_TRIPLET_DIR}/lib/libthriftcpp2.a
+ ${VCPKG_INSTALLED_DIR}/${VCPKG_TRIPLET_DIR}/lib/libthriftprotocol.a)
Review Comment:
Fixed in 2ab3f8d4f. The vcpkg Thrift path now uses VCPKG_TARGET_TRIPLET when
available and falls back to the processor-derived triplet only when the active
triplet is unavailable.
##########
dev/docker/Dockerfile.centos9-static-build:
##########
@@ -33,15 +33,15 @@ RUN set -ex; \
git clone --depth=1 https://github.com/apache/gluten /opt/gluten; \
cd /opt/gluten && bash ./dev/vcpkg/setup-build-depends.sh; \
mkdir -p ${VCPKG_PATH}; \
- echo "Build arrow, then install the native libs to system paths and jar
package to .m2/ directory."; \
+ echo "vcpkg installs the native dependencies and Maven resolves Java
dependencies."; \
if [ "$(uname -m)" = "aarch64" ]; then \
export CPU_TARGET="aarch64"; \
export VCPKG_FORCE_SYSTEM_BINARIES=1; \
fi; \
source /opt/rh/gcc-toolset-12/enable; \
cd /opt/gluten; \
bash ./dev/builddeps-veloxbe.sh --enable_vcpkg=ON --build_tests=ON
--enable_s3=ON --enable_gcs=ON \
- --enable_hdfs=ON --enable_abfs=ON
build_arrow; \
+ --enable_hdfs=ON --enable_abfs=ON true; \
Review Comment:
Addressed in 4b77376de. These static images intentionally populate
VCPKG_BINARY_SOURCES without building the full Velox/Gluten backend. The opaque
positional `true` has been replaced with a direct Bash `source
./dev/vcpkg/env.sh ...`, which runs vcpkg initialization/install and then exits.
##########
dev/docker/Dockerfile.centos8-static-build:
##########
@@ -46,7 +46,7 @@ RUN set -ex; \
cd /opt/gluten; \
export SSL_VERIFY=false; \
bash ./dev/builddeps-veloxbe.sh --enable_vcpkg=ON --build_tests=ON
--enable_s3=ON --enable_gcs=ON \
- --enable_hdfs=ON --enable_abfs=ON
build_arrow; \
+ --enable_hdfs=ON --enable_abfs=ON true; \
Review Comment:
Addressed in 4b77376de. These static images intentionally populate
VCPKG_BINARY_SOURCES without building the full Velox/Gluten backend. The opaque
positional `true` has been replaced with a direct Bash `source
./dev/vcpkg/env.sh ...`, which runs vcpkg initialization/install and then exits.
##########
dev/docker/Dockerfile.centos8-gcc13-static-build:
##########
@@ -37,14 +37,14 @@ RUN set -ex; \
dnf clean all; \
git clone --depth=1 https://github.com/apache/gluten /opt/gluten; \
mkdir -p ${VCPKG_PATH}; \
- echo "Build arrow, then install the native libs to system paths and jar
package to .m2/ directory."; \
+ echo "vcpkg installs the native dependencies and Maven resolves Java
dependencies."; \
if [ "$(uname -m)" = "aarch64" ]; then \
export CPU_TARGET="aarch64"; \
export VCPKG_FORCE_SYSTEM_BINARIES=1; \
fi; \
cd /opt/gluten; \
bash ./dev/builddeps-veloxbe.sh --enable_vcpkg=ON --build_tests=ON
--enable_s3=ON --enable_gcs=ON \
- --enable_hdfs=ON --enable_abfs=ON
build_arrow; \
+ --enable_hdfs=ON --enable_abfs=ON true; \
Review Comment:
Addressed in 4b77376de. These static images intentionally populate
VCPKG_BINARY_SOURCES without building the full Velox/Gluten backend. The opaque
positional `true` has been replaced with a direct Bash `source
./dev/vcpkg/env.sh ...`, which runs vcpkg initialization/install and then exits.
##########
dev/docker/Dockerfile.centos7-static-build:
##########
@@ -39,12 +39,12 @@ RUN set -ex; \
echo "check_certificate = off" >> ~/.wgetrc; \
cd /opt/gluten && bash ./dev/vcpkg/setup-build-depends.sh; \
mkdir -p ${VCPKG_PATH}; \
- echo "Build arrow, then install the native libs to system paths and jar
package to .m2/ directory."; \
+ echo "vcpkg installs the native dependencies and Maven resolves Java
dependencies."; \
cd /opt/gluten; \
source /opt/rh/devtoolset-11/enable; \
source /opt/rh/rh-git227/enable; \
bash ./dev/builddeps-veloxbe.sh --enable_vcpkg=ON --build_tests=ON
--enable_s3=ON --enable_gcs=ON \
- --enable_hdfs=ON --enable_abfs=ON
build_arrow; \
+ --enable_hdfs=ON --enable_abfs=ON
true; \
Review Comment:
Addressed in 4b77376de. These static images intentionally populate
VCPKG_BINARY_SOURCES without building the full Velox/Gluten backend. The opaque
positional `true` has been replaced with a direct Bash `source
./dev/vcpkg/env.sh ...`, which runs vcpkg initialization/install and then exits.
##########
dev/docker/Dockerfile.centos7-gcc13-static-build:
##########
@@ -43,10 +43,10 @@ RUN set -ex; \
yum remove gcc -y && yum clean all; \
yes | cp -rf /usr/share/aclocal/* /usr/local/share/aclocal/; \
mkdir -p ${VCPKG_PATH}; \
- echo "Build arrow, then install the native libs to system paths and jar
package to .m2/ directory."; \
+ echo "vcpkg installs the native dependencies and Maven resolves Java
dependencies."; \
cd /opt/gluten; \
bash ./dev/builddeps-veloxbe.sh --enable_vcpkg=ON --build_tests=ON
--enable_s3=ON --enable_gcs=ON \
- --enable_hdfs=ON --enable_abfs=ON
build_arrow; \
+ --enable_hdfs=ON --enable_abfs=ON
true; \
Review Comment:
Addressed in 4b77376de. These static images intentionally populate
VCPKG_BINARY_SOURCES without building the full Velox/Gluten backend. The opaque
positional `true` has been replaced with a direct Bash `source
./dev/vcpkg/env.sh ...`, which runs vcpkg initialization/install and then exits.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
