Skip to content

Commit

Permalink
try fork to solve libtool issue
Browse files Browse the repository at this point in the history
  • Loading branch information
tomjakubowski committed Oct 10, 2024
1 parent 3538354 commit e199b27
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 15 deletions.
1 change: 1 addition & 0 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ source:
- patches/disable_protobuf_src.diff
- patches/fix_windows.diff
- patches/fix_arrow.patch
- patches/fix_arrow_libtool.patch

build:
number: 0
Expand Down
15 changes: 15 additions & 0 deletions recipe/patches/fix_arrow_libtool.patch
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"
25 changes: 10 additions & 15 deletions recipe/patches/fix_flags.diff
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 +-
Expand Down Expand Up @@ -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 \
Expand All @@ -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 "")
Expand All @@ -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 "")
Expand All @@ -212,7 +207,7 @@ index e788e483c..f2790cf76 100644
${EXTENDED_FLAGS} \
${OPT_FLAGS} \
")

+set(CMAKE_CXX_FLAGS_DEBUG "")
+set(CMAKE_CXX_FLAGS_RELEASE "")
+
Expand All @@ -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

0 comments on commit e199b27

Please sign in to comment.