arrow-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From w...@apache.org
Subject arrow git commit: ARROW-852: Also search for ARROW libs when pkg-config provided the path
Date Wed, 19 Apr 2017 02:33:04 GMT
Repository: arrow
Updated Branches:
  refs/heads/master a94c03a02 -> 59cd801a7


ARROW-852: Also search for ARROW libs when pkg-config provided the path

Change-Id: Ic7fb227342782dfed5885f8fc5e73418fd31d504

Author: Uwe L. Korn <uwelk@xhochy.com>

Closes #563 from xhochy/ARROW-852 and squashes the following commits:

9630352 [Uwe L. Korn] Remove ARROW_HOME
5fc43ce [Uwe L. Korn] Always search for libs


Project: http://git-wip-us.apache.org/repos/asf/arrow/repo
Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/59cd801a
Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/59cd801a
Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/59cd801a

Branch: refs/heads/master
Commit: 59cd801a7645783c0c33ed2435be08db4ffcd378
Parents: a94c03a
Author: Uwe L. Korn <uwelk@xhochy.com>
Authored: Tue Apr 18 22:32:59 2017 -0400
Committer: Wes McKinney <wes.mckinney@twosigma.com>
Committed: Tue Apr 18 22:32:59 2017 -0400

----------------------------------------------------------------------
 python/cmake_modules/FindArrow.cmake | 61 ++++++++++++++++---------------
 python/manylinux1/build_arrow.sh     |  1 -
 2 files changed, 31 insertions(+), 31 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/arrow/blob/59cd801a/python/cmake_modules/FindArrow.cmake
----------------------------------------------------------------------
diff --git a/python/cmake_modules/FindArrow.cmake b/python/cmake_modules/FindArrow.cmake
index fbe4545..9fb1355 100644
--- a/python/cmake_modules/FindArrow.cmake
+++ b/python/cmake_modules/FindArrow.cmake
@@ -34,6 +34,7 @@ if ("$ENV{ARROW_HOME}" STREQUAL "")
     message(STATUS "Arrow SO version: ${ARROW_SO_VERSION}")
     set(ARROW_INCLUDE_DIR ${ARROW_INCLUDE_DIRS})
     set(ARROW_LIBS ${ARROW_LIBRARY_DIRS})
+    set(ARROW_SEARCH_LIB_PATH ${ARROW_LIBRARY_DIRS})
   endif()
 else()
   set(ARROW_HOME "$ENV{ARROW_HOME}")
@@ -51,42 +52,42 @@ else()
     # make sure we don't accidentally pick up a different version
     NO_DEFAULT_PATH
     )
+endif()
 
-  find_library(ARROW_LIB_PATH NAMES arrow
-    PATHS
-    ${ARROW_SEARCH_LIB_PATH}
-    NO_DEFAULT_PATH)
-  get_filename_component(ARROW_LIBS ${ARROW_LIB_PATH} DIRECTORY)
+find_library(ARROW_LIB_PATH NAMES arrow
+  PATHS
+  ${ARROW_SEARCH_LIB_PATH}
+  NO_DEFAULT_PATH)
+get_filename_component(ARROW_LIBS ${ARROW_LIB_PATH} DIRECTORY)
 
-  find_library(ARROW_JEMALLOC_LIB_PATH NAMES arrow_jemalloc
-    PATHS
-    ${ARROW_SEARCH_LIB_PATH}
-    NO_DEFAULT_PATH)
+find_library(ARROW_JEMALLOC_LIB_PATH NAMES arrow_jemalloc
+  PATHS
+  ${ARROW_SEARCH_LIB_PATH}
+  NO_DEFAULT_PATH)
 
-  find_library(ARROW_PYTHON_LIB_PATH NAMES arrow_python
-    PATHS
-    ${ARROW_SEARCH_LIB_PATH}
-    NO_DEFAULT_PATH)
+find_library(ARROW_PYTHON_LIB_PATH NAMES arrow_python
+  PATHS
+  ${ARROW_SEARCH_LIB_PATH}
+  NO_DEFAULT_PATH)
 
-  if (ARROW_INCLUDE_DIR AND ARROW_LIBS)
-    set(ARROW_FOUND TRUE)
+if (ARROW_INCLUDE_DIR AND ARROW_LIBS)
+  set(ARROW_FOUND TRUE)
 
-    if (MSVC)
-      set(ARROW_STATIC_LIB ${ARROW_LIB_PATH})
-      set(ARROW_PYTHON_STATIC_LIB ${ARROW_PYTHON_LIB_PATH})
-      set(ARROW_JEMALLOC_STATIC_LIB ${ARROW_JEMALLOC_LIB_PATH})
-      set(ARROW_SHARED_LIB ${ARROW_STATIC_LIB})
-      set(ARROW_PYTHON_SHARED_LIB ${ARROW_PYTHON_STATIC_LIB})
-      set(ARROW_JEMALLOC_SHARED_LIB ${ARROW_JEMALLOC_STATIC_LIB})
-    else()
-      set(ARROW_STATIC_LIB ${ARROW_PYTHON_LIB_PATH}/libarrow.a)
-      set(ARROW_PYTHON_STATIC_LIB ${ARROW_PYTHON_LIB_PATH}/libarrow_python.a)
-      set(ARROW_JEMALLOC_STATIC_LIB ${ARROW_PYTHON_LIB_PATH}/libarrow_jemalloc.a)
+  if (MSVC)
+    set(ARROW_STATIC_LIB ${ARROW_LIB_PATH})
+    set(ARROW_PYTHON_STATIC_LIB ${ARROW_PYTHON_LIB_PATH})
+    set(ARROW_JEMALLOC_STATIC_LIB ${ARROW_JEMALLOC_LIB_PATH})
+    set(ARROW_SHARED_LIB ${ARROW_STATIC_LIB})
+    set(ARROW_PYTHON_SHARED_LIB ${ARROW_PYTHON_STATIC_LIB})
+    set(ARROW_JEMALLOC_SHARED_LIB ${ARROW_JEMALLOC_STATIC_LIB})
+  else()
+    set(ARROW_STATIC_LIB ${ARROW_PYTHON_LIB_PATH}/libarrow.a)
+    set(ARROW_PYTHON_STATIC_LIB ${ARROW_PYTHON_LIB_PATH}/libarrow_python.a)
+    set(ARROW_JEMALLOC_STATIC_LIB ${ARROW_PYTHON_LIB_PATH}/libarrow_jemalloc.a)
 
-      set(ARROW_SHARED_LIB ${ARROW_LIBS}/libarrow${CMAKE_SHARED_LIBRARY_SUFFIX})
-      set(ARROW_JEMALLOC_SHARED_LIB ${ARROW_LIBS}/libarrow_jemalloc${CMAKE_SHARED_LIBRARY_SUFFIX})
-      set(ARROW_PYTHON_SHARED_LIB ${ARROW_LIBS}/libarrow_python${CMAKE_SHARED_LIBRARY_SUFFIX})
-    endif()
+    set(ARROW_SHARED_LIB ${ARROW_LIBS}/libarrow${CMAKE_SHARED_LIBRARY_SUFFIX})
+    set(ARROW_JEMALLOC_SHARED_LIB ${ARROW_LIBS}/libarrow_jemalloc${CMAKE_SHARED_LIBRARY_SUFFIX})
+    set(ARROW_PYTHON_SHARED_LIB ${ARROW_LIBS}/libarrow_python${CMAKE_SHARED_LIBRARY_SUFFIX})
   endif()
 endif()
 

http://git-wip-us.apache.org/repos/asf/arrow/blob/59cd801a/python/manylinux1/build_arrow.sh
----------------------------------------------------------------------
diff --git a/python/manylinux1/build_arrow.sh b/python/manylinux1/build_arrow.sh
index 3df3225..8ef087c 100755
--- a/python/manylinux1/build_arrow.sh
+++ b/python/manylinux1/build_arrow.sh
@@ -37,7 +37,6 @@ export PYARROW_WITH_JEMALLOC=1
 export PYARROW_BUNDLE_ARROW_CPP=1
 # Need as otherwise arrow_io is sometimes not linked
 export LDFLAGS="-Wl,--no-as-needed"
-export ARROW_HOME="/arrow-dist"
 export PARQUET_HOME="/usr"
 export PKG_CONFIG_PATH=/arrow-dist/lib64/pkgconfig
 


Mime
View raw message