-
-
Notifications
You must be signed in to change notification settings - Fork 11
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
3538354
commit e199b27
Showing
3 changed files
with
26 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
diff --git a/cmake/arrow.txt.in b/cmake/arrow.txt.in | ||
index 5b3105102..a012b6801 100644 | ||
--- a/cmake/arrow.txt.in | ||
+++ b/cmake/arrow.txt.in | ||
@@ -9,8 +9,8 @@ project(arrow-download NONE) | ||
|
||
include(ExternalProject) | ||
ExternalProject_Add(apachearrow | ||
- GIT_REPOSITORY https://github.com/apache/arrow.git | ||
- GIT_TAG apache-arrow-17.0.0 | ||
+ GIT_REPOSITORY https://github.com/ProspectiveCo/arrow.git | ||
+ GIT_BRANCH tom-libtool | ||
SOURCE_DIR "${CMAKE_BINARY_DIR}/arrow-src" | ||
BINARY_DIR "${CMAKE_BINARY_DIR}/arrow-build" | ||
SOURCE_SUBDIR "cpp" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,3 @@ | ||
From 686edd727d9b61516834d23a75b8e070153fa8fe Mon Sep 17 00:00:00 2001 | ||
From: Tom Jakubowski <[email protected]> | ||
Date: Sun, 29 Sep 2024 18:28:17 +0000 | ||
Subject: [PATCH] ../perspective-feedstock/recipe/patches/fix_flags.diff | ||
|
||
--- | ||
cmake/Pybind.txt.in | 2 +- | ||
cmake/arrow.txt.in | 2 +- | ||
|
@@ -156,18 +151,18 @@ index e788e483c..f2790cf76 100644 | |
--- a/cpp/perspective/CMakeLists.txt | ||
+++ b/cpp/perspective/CMakeLists.txt | ||
@@ -50,7 +50,7 @@ endif() | ||
|
||
|
||
if(WIN32) | ||
- set(CMAKE_CXX_FLAGS " /EHsc /MP /MT /c /bigobj") | ||
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc /MP /MT /c /bigobj") | ||
else() | ||
# set(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS}") | ||
endif() | ||
@@ -325,22 +325,6 @@ endif() | ||
|
||
set(RAPIDJSON_BUILD_TESTS OFF CACHE BOOL "Disable rapidjson tests") | ||
|
||
- | ||
-set(CMAKE_C_FLAGS " \ | ||
--O3 \ | ||
|
@@ -186,10 +181,10 @@ index e788e483c..f2790cf76 100644 | |
- | ||
if(PSP_PYODIDE) | ||
set(RELOCATABLE_FLAGS "-sRELOCATABLE=1 -sSIDE_MODULE=2 -sWASM_BIGINT=1") | ||
|
||
@@ -413,24 +397,27 @@ psp_build_dep("exprtk" "${PSP_CMAKE_MODULE_PATH}/exprtk.txt.in") | ||
add_subdirectory(${PSP_CMAKE_MODULE_PATH}/../cpp/protos "${CMAKE_BINARY_DIR}/protos-build") | ||
|
||
# #################### | ||
-set(CMAKE_C_FLAGS_DEBUG "") | ||
-set(CMAKE_C_FLAGS_RELEASE "") | ||
|
@@ -201,7 +196,7 @@ index e788e483c..f2790cf76 100644 | |
") | ||
+set(CMAKE_C_FLAGS_DEBUG "") | ||
+set(CMAKE_C_FLAGS_RELEASE "") | ||
|
||
# prevents the default debug flags from overriding the debug flags we | ||
# set in OPT_FLAGS | ||
-set(CMAKE_CXX_FLAGS_DEBUG "") | ||
|
@@ -212,7 +207,7 @@ index e788e483c..f2790cf76 100644 | |
${EXTENDED_FLAGS} \ | ||
${OPT_FLAGS} \ | ||
") | ||
|
||
+set(CMAKE_CXX_FLAGS_DEBUG "") | ||
+set(CMAKE_CXX_FLAGS_RELEASE "") | ||
+ | ||
|
@@ -221,13 +216,13 @@ index e788e483c..f2790cf76 100644 | |
endif() | ||
@@ -533,7 +520,7 @@ set(WASM_SOURCE_FILES ${SOURCE_FILES}) | ||
message("${BUILD_MESSAGE}\n") | ||
|
||
if(WIN32) | ||
- set(CMAKE_CXX_FLAGS " /EHsc /MP /MT /c /bigobj") | ||
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc /MP /MT /c /bigobj") | ||
else() | ||
# set(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS}") | ||
endif() | ||
-- | ||
-- | ||
2.46.1 | ||
|