-
-
Notifications
You must be signed in to change notification settings - Fork 63
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Showing
4 changed files
with
34 additions
and
2 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
2 changes: 1 addition & 1 deletion
2
recipe/patches/0001-ARROW-18340-Python-PyArrow-C-header-files-no-longer-.patch
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
2 changes: 1 addition & 1 deletion
2
recipe/patches/0002-properly-skip-if-instantiation-of-gcs_server-gcfs-fi.patch
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
26 changes: 26 additions & 0 deletions
26
recipe/patches/0003-don-t-bake-non-relocatable-CMAKE_INSTALL_FULL_LIBDIR.patch
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,26 @@ | ||
From 7b0b770b7c35218de9e68e9c5fd2f2212cf56e07 Mon Sep 17 00:00:00 2001 | ||
From: "H. Vetinari" <h.vetinari@gmx.com> | ||
Date: Thu, 26 Jan 2023 12:37:02 +1100 | ||
Subject: [PATCH 3/3] don't bake non-relocatable CMAKE_INSTALL_FULL_LIBDIR into | ||
gdb-integration | ||
|
||
--- | ||
cpp/src/arrow/CMakeLists.txt | 2 +- | ||
1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
||
diff --git a/cpp/src/arrow/CMakeLists.txt b/cpp/src/arrow/CMakeLists.txt | ||
index 099a86237..cd6d15e8b 100644 | ||
--- a/cpp/src/arrow/CMakeLists.txt | ||
+++ b/cpp/src/arrow/CMakeLists.txt | ||
@@ -620,7 +620,7 @@ if(ARROW_BUILD_SHARED AND NOT WIN32) | ||
endif() | ||
else() | ||
set(ARROW_GDB_AUTO_LOAD_LIBARROW_GDB_DIR | ||
- "${ARROW_GDB_AUTO_LOAD_DIR}/${CMAKE_INSTALL_FULL_LIBDIR}") | ||
+ "${ARROW_GDB_AUTO_LOAD_DIR}/replace_this_section_with_absolute_slashed_path_to_CONDA_PREFIX/lib/") | ||
set(ARROW_GDB_AUTO_LOAD_LIBARROW_GDB_INSTALL TRUE) | ||
endif() | ||
if(ARROW_GDB_AUTO_LOAD_LIBARROW_GDB_INSTALL) | ||
-- | ||
2.38.1.windows.1 | ||
|