[
https://issues.apache.org/jira/browse/ARROW-1778?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16259286#comment-16259286
]
ASF GitHub Bot commented on ARROW-1778:
---
wesm closed pull request #1331: ARROW-1778: [Python] Link parquet-cpp
statically, privately in manylinux1 wheels
URL: https://github.com/apache/arrow/pull/1331
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/cpp/cmake_modules/FindThrift.cmake
b/cpp/cmake_modules/FindThrift.cmake
new file mode 100644
index 0..25f50825c
--- /dev/null
+++ b/cpp/cmake_modules/FindThrift.cmake
@@ -0,0 +1,102 @@
+# Copyright 2012 Cloudera Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+# - Find Thrift (a cross platform RPC lib/tool)
+#
+# Variables used by this module, they can change the default behaviour and need
+# to be set before calling find_package:
+#
+# Thrift_HOME - When set, this path is inspected instead of standard library
+#locations as the root of the Thrift installation.
+#The environment variable THRIFT_HOME overrides this variable.
+#
+# This module defines
+# THRIFT_VERSION, version string of ant if found
+# THRIFT_INCLUDE_DIR, where to find THRIFT headers
+# THRIFT_CONTRIB_DIR, where contrib thrift files (e.g. fb303.thrift) are
installed
+# THRIFT_STATIC_LIB, THRIFT static library
+# THRIFT_FOUND, If false, do not try to use ant
+
+# prefer the thrift version supplied in THRIFT_HOME
+if( NOT "${THRIFT_HOME}" STREQUAL "")
+file( TO_CMAKE_PATH "${THRIFT_HOME}" _native_path )
+list( APPEND _thrift_roots ${_native_path} )
+elseif ( Thrift_HOME )
+list( APPEND _thrift_roots ${Thrift_HOME} )
+endif()
+
+message(STATUS "THRIFT_HOME: ${THRIFT_HOME}")
+find_path(THRIFT_INCLUDE_DIR thrift/Thrift.h HINTS
+ ${_thrift_roots}
+ NO_DEFAULT_PATH
+ PATH_SUFFIXES "include"
+)
+
+find_path(THRIFT_CONTRIB_DIR share/fb303/if/fb303.thrift HINTS
+ ${_thrift_roots}
+ NO_DEFAULT_PATH
+)
+
+if (MSVC AND NOT THRIFT_MSVC_STATIC_LIB_SUFFIX)
+ set(THRIFT_MSVC_STATIC_LIB_SUFFIX md)
+endif()
+
+find_library(THRIFT_STATIC_LIB NAMES
+
${CMAKE_STATIC_LIBRARY_PREFIX}thrift${THRIFT_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}
+ HINTS ${_thrift_roots}
+ NO_DEFAULT_PATH
+ PATH_SUFFIXES "lib/${CMAKE_LIBRARY_ARCHITECTURE}" "lib"
+)
+
+find_program(THRIFT_COMPILER thrift HINTS
+ ${_thrift_roots}
+ NO_DEFAULT_PATH
+ PATH_SUFFIXES "bin"
+)
+
+if (THRIFT_STATIC_LIB)
+ set(THRIFT_FOUND TRUE)
+ exec_program(${THRIFT_COMPILER}
+ARGS -version OUTPUT_VARIABLE THRIFT_VERSION RETURN_VALUE THRIFT_RETURN)
+else ()
+ set(THRIFT_FOUND FALSE)
+endif ()
+
+if (THRIFT_FOUND)
+ if (NOT Thrift_FIND_QUIETLY)
+message(STATUS "Thrift version: ${THRIFT_VERSION}")
+ endif ()
+else ()
+ if (NOT Thrift_FIND_QUIETLY)
+set(THRIFT_ERR_MSG "Thrift compiler/libraries NOT found: ${THRIFT_RETURN}")
+set(THRIFT_ERR_MSG "${THRIFT_ERR_MSG} (${THRIFT_INCLUDE_DIR},
${THRIFT_STATIC_LIB}).")
+if ( _thrift_roots )
+ set(THRIFT_ERR_MSG "${THRIFT_ERR_MSG} Looked in ${_thrift_roots}.")
+else ()
+ set(THRIFT_ERR_MSG "${THRIFT_ERR_MSG} Looked in system search paths.")
+endif ()
+if ( Thrift_FIND_REQUIRED )
+ message(FATAL_ERROR "${THRIFT_ERR_MSG}")
+else ()
+ message(STATUS "${THRIFT_ERR_MSG}")
+endif ()
+ endif ()
+endif ()
+
+
+mark_as_advanced(
+ THRIFT_STATIC_LIB
+ THRIFT_COMPILER
+ THRIFT_INCLUDE_DIR
+)
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index 8c7348298..00a4ee687 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -61,6 +61,9 @@ if("${CMAKE_SOURCE_DIR}" STREQUAL
"${CMAKE_CURRENT_SOURCE_DIR}")
option(PYARROW_BUILD_PARQUET
"Build the PyArrow Parquet integration"
OFF)
+ option(PYARROW_PARQUET_USE_SHARED
+"Rely on parquet shared libraries where relevant"
+ON)
option(PYARROW_BUILD_PLASMA
"Build the PyArrow Plasma integration"
OFF)
@@ -282,24 +285,41 @@ if (PYARROW_BUILD_PARQUET)
endif()
include_directories(SYSTEM ${PARQUET_INCLUDE_DIR})
- if (PYARROW_BUNDLE_ARROW_CPP)
-bundle_arrow_lib(PARQUET_SHARED_LIB
- ABI_VERSION ${PARQUET_ABI_VERSION}
- SO_VERSION
