Skip to content

Commit

Permalink
add patch to make gdb-integration work with conda
Browse files Browse the repository at this point in the history
  • Loading branch information
h-vetinari committed Mar 21, 2023
1 parent ed78d6a commit fead3ed
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 0 deletions.
4 changes: 4 additions & 0 deletions dev/tasks/conda-recipes/arrow-cpp/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ package:

source:
path: ../../../../
patches:
# patch that's necessary to make gdb integration work, due to the fact that
# we're not installing into the final environment when building with conda
- patches/0001-don-t-bake-non-relocatable-CMAKE_INSTALL_FULL_LIBDIR.patch

build:
number: 0
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
From 7f1350d76bf71a8123cf78abe18ddb5876a7ca80 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] 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 90ab1e6ac..c1f51e0da 100644
--- a/cpp/src/arrow/CMakeLists.txt
+++ b/cpp/src/arrow/CMakeLists.txt
@@ -644,7 +644,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

0 comments on commit fead3ed

Please sign in to comment.