diff options
| author | Yuri Victorovich <yuri@FreeBSD.org> | 2021-12-13 20:35:21 -0800 |
|---|---|---|
| committer | Yuri Victorovich <yuri@FreeBSD.org> | 2021-12-13 20:36:12 -0800 |
| commit | 61dc3caeec62b43e14aedb7c32148b45830a8d26 (patch) | |
| tree | 44414167678e06382d69120610a01b0eebe225f2 /databases/arrow/files | |
| parent | www/{squid,squid-devel}: Remove PCRE option (diff) | |
databases/arrow: Update 4.0.1 -> 6.0.1
Diffstat (limited to 'databases/arrow/files')
| -rw-r--r-- | databases/arrow/files/patch-CMakeLists.txt | 12 | ||||
| -rw-r--r-- | databases/arrow/files/patch-cmake__modules_SetupCxxFlags.cmake | 4 |
2 files changed, 7 insertions, 9 deletions
diff --git a/databases/arrow/files/patch-CMakeLists.txt b/databases/arrow/files/patch-CMakeLists.txt index a5913686ab35..42e63905630f 100644 --- a/databases/arrow/files/patch-CMakeLists.txt +++ b/databases/arrow/files/patch-CMakeLists.txt @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2021-04-21 16:14:36 UTC +--- CMakeLists.txt.orig 2021-11-10 02:07:56 UTC +++ CMakeLists.txt -@@ -98,7 +98,7 @@ set(ARROW_BINARY_DIR ${PROJECT_BINARY_DIR}) +@@ -100,7 +100,7 @@ set(ARROW_BINARY_DIR ${PROJECT_BINARY_DIR}) include(CMakePackageConfigHelpers) include(CMakeParseArguments) @@ -9,18 +9,16 @@ include(FindPackageHandleStandardArgs) include(GNUInstallDirs) -@@ -910,10 +910,10 @@ if(ARROW_BUILD_EXAMPLES) +@@ -943,9 +943,9 @@ if(ARROW_BUILD_EXAMPLES) add_subdirectory(examples/arrow) endif() -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../LICENSE.txt - ${CMAKE_CURRENT_SOURCE_DIR}/../NOTICE.txt -- ${CMAKE_CURRENT_SOURCE_DIR}/README.md -- DESTINATION "${ARROW_DOC_DIR}") +- ${CMAKE_CURRENT_SOURCE_DIR}/README.md DESTINATION "${ARROW_DOC_DIR}") +#install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../LICENSE.txt +# ${CMAKE_CURRENT_SOURCE_DIR}/../NOTICE.txt -+# ${CMAKE_CURRENT_SOURCE_DIR}/README.md -+# DESTINATION "${ARROW_DOC_DIR}") ++# ${CMAKE_CURRENT_SOURCE_DIR}/README.md DESTINATION "${ARROW_DOC_DIR}") # # Validate and print out Arrow configuration options diff --git a/databases/arrow/files/patch-cmake__modules_SetupCxxFlags.cmake b/databases/arrow/files/patch-cmake__modules_SetupCxxFlags.cmake index 7c5034184e6e..224c1ecbf360 100644 --- a/databases/arrow/files/patch-cmake__modules_SetupCxxFlags.cmake +++ b/databases/arrow/files/patch-cmake__modules_SetupCxxFlags.cmake @@ -1,10 +1,10 @@ ---- cmake_modules/SetupCxxFlags.cmake.orig 2021-04-21 16:14:36 UTC +--- cmake_modules/SetupCxxFlags.cmake.orig 2021-11-10 02:07:56 UTC +++ cmake_modules/SetupCxxFlags.cmake @@ -28,7 +28,7 @@ if(NOT DEFINED ARROW_CPU_FLAG) set(ARROW_CPU_FLAG "armv8") elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "armv7") set(ARROW_CPU_FLAG "armv7") -- elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "ppc") +- elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "powerpc|ppc") + elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "powerpc|powerpc64|ppc") set(ARROW_CPU_FLAG "ppc") elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "s390x") |