Skip to content

Commit

Permalink
fix gdb-integration
Browse files Browse the repository at this point in the history
Closes #935
  • Loading branch information
h-vetinari committed Jan 26, 2023
1 parent 9dfdaf1 commit 51b91ef
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 2 deletions.
6 changes: 6 additions & 0 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@ source:
# switch off tests that require the as-yet unpackaged
# https://github.com/googleapis/storage-testbench
- patches/0002-properly-skip-if-instantiation-of-gcs_server-gcfs-fi.patch
# gdb-integration needs full path to shared library, see
# https://github.com/apache/arrow/blob/master/docs/source/cpp/gdb.rst#manual-loading
# however, baking the installation-env into the path for the gdb-file cannot work
# with the usual relocation treatement and leads to other issues, see #935;
# replace with placeholder that allows interested users to fix the file path
- patches/0003-don-t-bake-non-relocatable-CMAKE_INSTALL_FULL_LIBDIR.patch
# testing-submodule not part of release tarball
- git_url: https://github.com/apache/arrow-testing.git
git_rev: 00c483283433b4c02cb811f260dbe35414c806a4
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 984b9c8cf0b72e24e8917900862b37964fb27e58 Mon Sep 17 00:00:00 2001
From: Alenka Frim <AlenkaF@users.noreply.github.com>
Date: Tue, 22 Nov 2022 22:01:32 +0100
Subject: [PATCH 1/2] ARROW-18340: [Python] PyArrow C++ header files no longer
Subject: [PATCH 1/3] ARROW-18340: [Python] PyArrow C++ header files no longer
always included in installed pyarrow (#14656)

This PR adds code to `_run_cmake` to always copy PyArrow C++ header files to `pyarrow/iclude`.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 652c929e80cb53425027d225d3a858266b54360b Mon Sep 17 00:00:00 2001
From: "H. Vetinari" <h.vetinari@gmx.com>
Date: Mon, 5 Dec 2022 20:15:58 +1100
Subject: [PATCH 2/2] properly skip if instantiation of gcs_server/gcfs fixture
Subject: [PATCH 2/3] properly skip if instantiation of gcs_server/gcfs fixture
fails

---
Expand Down
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

0 comments on commit 51b91ef

Please sign in to comment.