mirrors/arrow
0
0 Fork 0
mirror of https://github.com/apache/arrow.git synced 2026-10-28 16:47:19 +08:00
Code Activity

Also link static libs to librt

Browse Source 
Change-Id: I93c4c9e724830805836fb5923b251dd831093d17
This commit is contained in:
Uwe L. Korn committed 2017-06-20 09:57:10 +02:00
1 parent 35212bc077
commit bac694df25
3 files changed
+11 -16
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

cpp/CMakeLists.txt
+4 -10
View File
@@ -953,23 +953,17 @@ if (ARROW_JEMALLOC)
# most cases to use the system provided version of jemalloc to better align with
# other potential users of jemalloc.
if (JEMALLOC_STATIC_LIB)
set(ARROW_JEMALLOC_STATIC_LINK_LIBS
jemalloc_static
)
set(ARROW_JEMALLOC_STATIC_LINK_LIBS jemalloc_static)
else()
set(ARROW_JEMALLOC_STATIC_LINK_LIBS
jemalloc_shared
)
set(ARROW_JEMALLOC_STATIC_LINK_LIBS jemalloc_shared)
endif()
if (NOT APPLE)
set(ARROW_JEMALLOC_STATIC_LINK_LIBS ${ARROW_JEMALLOC_STATIC_LINK_LIBS} ${PTHREAD_LIBRARY})
set(ARROW_JEMALLOC_STATIC_LINK_LIBS ${ARROW_JEMALLOC_STATIC_LINK_LIBS} ${PTHREAD_LIBRARY} rt)
endif()
if (ARROW_JEMALLOC_USE_SHARED)
set(ARROW_JEMALLOC_SHARED_LINK_LIBS
jemalloc_shared
)
set(ARROW_JEMALLOC_SHARED_LINK_LIBS jemalloc_shared)
else()
if (CMAKE_COMPILER_IS_GNUCXX)
set(ARROW_JEMALLOC_SHARED_LINK_LIBS
python/manylinux1/Dockerfile-x86_64
+5 -5
View File
@@ -9,17 +9,17 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License. See accompanying LICENSE file.
FROM quay.io/xhochy/arrow_manylinux1_x86_64_base:ARROW-1024
FROM arrow_manylinux1_x86_64_base:latest
ADD arrow /arrow
WORKDIR /arrow/cpp
RUN mkdir build-plain
WORKDIR /arrow/cpp/build-plain
RUN cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/arrow-dist -DARROW_BUILD_TESTS=OFF -DARROW_BUILD_SHARED=ON -DARROW_BOOST_USE_SHARED=OFF -DARROW_JEMALLOC=ON -DARROW_RPATH_ORIGIN=ON -DARROW_JEMALLOC_USE_SHARED=OFF ..
RUN make -j5 install
RUN cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/arrow-dist -DARROW_BUILD_TESTS=OFF -DARROW_BUILD_SHARED=ON -DARROW_BOOST_USE_SHARED=OFF -DARROW_JEMALLOC=ON -DARROW_RPATH_ORIGIN=ON -DARROW_JEMALLOC_USE_SHARED=OFF ..
RUN ninja install
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_BOOST_USE_SHARED=OFF .
RUN make -j5 install
RUN ARROW_HOME=/arrow-dist cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/arrow-dist -DPARQUET_BUILD_TESTS=OFF -DPARQUET_BOOST_USE_SHARED=OFF -GNinja .
RUN ninja install
python/manylinux1/Dockerfile-x86_64_base
+2 -1
View File
@@ -25,8 +25,9 @@ RUN /build_jemalloc.sh
WORKDIR /
# Install cmake manylinux1 package
RUN /opt/python/cp35-cp35m/bin/pip install cmake
RUN /opt/python/cp35-cp35m/bin/pip install cmake ninja
RUN ln -s /opt/python/cp35-cp35m/bin/cmake /usr/bin/cmake
RUN ln -s /opt/python/cp35-cp35m/bin/ninja /usr/bin/ninja
ADD scripts/build_gtest.sh /
RUN /build_gtest.sh