diff options
Diffstat (limited to 'ports/arrow/all.patch')
| -rw-r--r-- | ports/arrow/all.patch | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/ports/arrow/all.patch b/ports/arrow/all.patch index 2e994af9b..3257dc437 100644 --- a/ports/arrow/all.patch +++ b/ports/arrow/all.patch @@ -1,7 +1,7 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt +diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 52081c4..e1e13b5 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt +--- a/cpp/CMakeLists.txt ++++ b/cpp/CMakeLists.txt @@ -804,6 +804,9 @@ if(ARROW_USE_GLOG) list(APPEND ARROW_LINK_LIBS GLOG::glog) list(APPEND ARROW_STATIC_LINK_LIBS GLOG::glog) @@ -12,10 +12,10 @@ index 52081c4..e1e13b5 100644 add_definitions("-DARROW_USE_GLOG") endif() -diff --git a/cmake_modules/FindBrotli.cmake b/cmake_modules/FindBrotli.cmake +diff --git a/cpp/cmake_modules/FindBrotli.cmake b/cpp/cmake_modules/FindBrotli.cmake index e1429a2..6dee036 100644 ---- a/cmake_modules/FindBrotli.cmake -+++ b/cmake_modules/FindBrotli.cmake +--- a/cpp/cmake_modules/FindBrotli.cmake ++++ b/cpp/cmake_modules/FindBrotli.cmake @@ -18,6 +18,7 @@ # find_package(Brotli) @@ -110,10 +110,10 @@ index e1429a2..6dee036 100644 find_package_handle_standard_args(Brotli REQUIRED_VARS BROTLI_COMMON_LIBRARY -diff --git a/cmake_modules/FindLz4.cmake b/cmake_modules/FindLz4.cmake +diff --git a/cpp/cmake_modules/FindLz4.cmake b/cpp/cmake_modules/FindLz4.cmake index 3606f5c..1d18b7c 100644 ---- a/cmake_modules/FindLz4.cmake -+++ b/cmake_modules/FindLz4.cmake +--- a/cpp/cmake_modules/FindLz4.cmake ++++ b/cpp/cmake_modules/FindLz4.cmake @@ -19,24 +19,26 @@ if(MSVC AND NOT DEFINED LZ4_MSVC_STATIC_LIB_SUFFIX) set(LZ4_MSVC_STATIC_LIB_SUFFIX "_static") endif() @@ -157,10 +157,10 @@ index 3606f5c..1d18b7c 100644 PATH_SUFFIXES "lib64" "lib" "bin") find_path(LZ4_INCLUDE_DIR NAMES lz4.h PATH_SUFFIXES "include") endif() -diff --git a/cmake_modules/FindThrift.cmake b/cmake_modules/FindThrift.cmake +diff --git a/cpp/cmake_modules/FindThrift.cmake b/cpp/cmake_modules/FindThrift.cmake index a4decf7..78ec7c8 100644 ---- a/cmake_modules/FindThrift.cmake -+++ b/cmake_modules/FindThrift.cmake +--- a/cpp/cmake_modules/FindThrift.cmake ++++ b/cpp/cmake_modules/FindThrift.cmake @@ -65,6 +65,10 @@ if(MSVC AND NOT THRIFT_MSVC_STATIC_LIB_SUFFIX) set(THRIFT_MSVC_STATIC_LIB_SUFFIX md) endif() @@ -191,10 +191,10 @@ index a4decf7..78ec7c8 100644 HINTS ${Thrift_ROOT} PATH_SUFFIXES "lib/${CMAKE_LIBRARY_ARCHITECTURE}" "lib") find_path(THRIFT_INCLUDE_DIR thrift/Thrift.h -diff --git a/cmake_modules/FindZSTD.cmake b/cmake_modules/FindZSTD.cmake +diff --git a/cpp/cmake_modules/FindZSTD.cmake b/cpp/cmake_modules/FindZSTD.cmake index 17b58a3..fa2ab05 100644 ---- a/cmake_modules/FindZSTD.cmake -+++ b/cmake_modules/FindZSTD.cmake +--- a/cpp/cmake_modules/FindZSTD.cmake ++++ b/cpp/cmake_modules/FindZSTD.cmake @@ -19,7 +19,11 @@ if(MSVC AND NOT DEFINED ZSTD_MSVC_STATIC_LIB_SUFFIX) set(ZSTD_MSVC_STATIC_LIB_SUFFIX "_static") endif() @@ -242,10 +242,10 @@ index 17b58a3..fa2ab05 100644 find_path(ZSTD_INCLUDE_DIR NAMES zstd.h PATH_SUFFIXES "include") endif() -diff --git a/cmake_modules/FindgflagsAlt.cmake b/cmake_modules/FindgflagsAlt.cmake +diff --git a/cpp/cmake_modules/FindgflagsAlt.cmake b/cpp/cmake_modules/FindgflagsAlt.cmake index a9b8684..fdb815a 100644 ---- a/cmake_modules/FindgflagsAlt.cmake -+++ b/cmake_modules/FindgflagsAlt.cmake +--- a/cpp/cmake_modules/FindgflagsAlt.cmake ++++ b/cpp/cmake_modules/FindgflagsAlt.cmake @@ -15,18 +15,13 @@ # specific language governing permissions and limitations # under the License. @@ -270,10 +270,10 @@ index a9b8684..fdb815a 100644 find_package_handle_standard_args(gflagsAlt REQUIRED_VARS gflags_LIB GFLAGS_INCLUDE_DIR) if(gflagsAlt_FOUND) -diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake +diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake index bdb122b..58c123e 100644 ---- a/cmake_modules/ThirdpartyToolchain.cmake -+++ b/cmake_modules/ThirdpartyToolchain.cmake +--- a/cpp/cmake_modules/ThirdpartyToolchain.cmake ++++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake @@ -923,10 +923,7 @@ if(ARROW_NEED_GFLAGS) elseif(gflags_SOURCE STREQUAL "SYSTEM") # gflagsConfig.cmake is not installed on Ubuntu/Debian |