This is an automated email from the ASF dual-hosted git repository.
uwe pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new d6aa492 ARROW-2850: [C++/Python] Correctly set RPATHs on all binaries
d6aa492 is described below
commit d6aa492754b9edc0f207885d5082284ec394d467
Author: Korn, Uwe <uwe.k...@blue-yonder.com>
AuthorDate: Sun Jul 15 22:11:00 2018 +0200
ARROW-2850: [C++/Python] Correctly set RPATHs on all binaries
This requires https://github.com/apache/parquet-cpp/pull/476
Author: Korn, Uwe <uwe.k...@blue-yonder.com>
Closes #2266 from xhochy/ARROW-2850 and squashes the following commits:
002b4d88 <Korn, Uwe> ARROW-2850: Correctly set RPATHs on all binaries
---
python/manylinux1/Dockerfile-x86_64 | 4 ++--
python/manylinux1/scripts/build_boost.sh | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/python/manylinux1/Dockerfile-x86_64
b/python/manylinux1/Dockerfile-x86_64
index 5bd64d1..4b26e21 100644
--- a/python/manylinux1/Dockerfile-x86_64
+++ b/python/manylinux1/Dockerfile-x86_64
@@ -14,7 +14,7 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-FROM quay.io/xhochy/arrow_manylinux1_x86_64_base:latest
+FROM quay.io/xhochy/arrow_manylinux1_x86_64_base:ARROW-2850
ADD arrow /arrow
WORKDIR /arrow/cpp
@@ -29,5 +29,5 @@ RUN /check_arrow_visibility.sh
WORKDIR /
RUN git clone https://github.com/apache/parquet-cpp.git
WORKDIR /parquet-cpp
-RUN ARROW_HOME=/arrow-dist cmake -DCMAKE_BUILD_TYPE=Release
-DCMAKE_INSTALL_PREFIX=/arrow-dist -DPARQUET_BUILD_TESTS=OFF
-DPARQUET_BUILD_SHARED=ON -DPARQUET_BUILD_STATIC=OFF
-DPARQUET_BOOST_USE_SHARED=ON -DBoost_NAMESPACE=arrow_boost
-DBOOST_ROOT=/arrow_boost_dist -GNinja .
+RUN ARROW_HOME=/arrow-dist cmake -DCMAKE_BUILD_TYPE=Release
-DCMAKE_INSTALL_PREFIX=/arrow-dist -DPARQUET_BUILD_TESTS=OFF
-DPARQUET_BUILD_SHARED=ON -DPARQUET_BUILD_STATIC=OFF
-DPARQUET_BOOST_USE_SHARED=ON -DBoost_NAMESPACE=arrow_boost
-DBOOST_ROOT=/arrow_boost_dist -DPARQUET_RPATH_ORIGIN=ON -GNinja .
RUN ninja install
diff --git a/python/manylinux1/scripts/build_boost.sh
b/python/manylinux1/scripts/build_boost.sh
index 68d4501..4bdd7fa 100755
--- a/python/manylinux1/scripts/build_boost.sh
+++ b/python/manylinux1/scripts/build_boost.sh
@@ -31,7 +31,7 @@ popd
pushd /arrow_boost
ls -l
./bootstrap.sh
-./bjam cxxflags='-std=c++11 -fPIC' cflags=-fPIC linkflags="-std=c++11"
variant=release link=shared --prefix=/arrow_boost_dist --with-filesystem
--with-date_time --with-system --with-regex install
+./bjam dll-path="'\$ORIGIN/'" cxxflags='-std=c++11 -fPIC' cflags=-fPIC
linkflags="-std=c++11" variant=release link=shared --prefix=/arrow_boost_dist
--with-filesystem --with-date_time --with-system --with-regex install
popd
rm -rf boost_${BOOST_VERSION_UNDERSCORE}.tar.gz
boost_${BOOST_VERSION_UNDERSCORE} arrow_boost
# Boost always install header-only parts but they also take up quite some
space.
