From fead3ed9488a8f8a624c5d2a6c000bb2e6f8cc95 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 21 Mar 2023 19:13:39 +1100 Subject: [PATCH] add patch to make gdb-integration work with conda --- dev/tasks/conda-recipes/arrow-cpp/meta.yaml | 4 +++ ...elocatable-CMAKE_INSTALL_FULL_LIBDIR.patch | 26 +++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 dev/tasks/conda-recipes/arrow-cpp/patches/0001-don-t-bake-non-relocatable-CMAKE_INSTALL_FULL_LIBDIR.patch diff --git a/dev/tasks/conda-recipes/arrow-cpp/meta.yaml b/dev/tasks/conda-recipes/arrow-cpp/meta.yaml index be069aa4636f7..731f63c4bd50c 100644 --- a/dev/tasks/conda-recipes/arrow-cpp/meta.yaml +++ b/dev/tasks/conda-recipes/arrow-cpp/meta.yaml @@ -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 diff --git a/dev/tasks/conda-recipes/arrow-cpp/patches/0001-don-t-bake-non-relocatable-CMAKE_INSTALL_FULL_LIBDIR.patch b/dev/tasks/conda-recipes/arrow-cpp/patches/0001-don-t-bake-non-relocatable-CMAKE_INSTALL_FULL_LIBDIR.patch new file mode 100644 index 0000000000000..b84564c406e7d --- /dev/null +++ b/dev/tasks/conda-recipes/arrow-cpp/patches/0001-don-t-bake-non-relocatable-CMAKE_INSTALL_FULL_LIBDIR.patch @@ -0,0 +1,26 @@ +From 7f1350d76bf71a8123cf78abe18ddb5876a7ca80 Mon Sep 17 00:00:00 2001 +From: "H. Vetinari" +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 +