From 06754c9bf5dfb1c5aa2809817aaeba5c41708992 Mon Sep 17 00:00:00 2001 From: Gard Spreemann Date: Thu, 24 May 2018 11:25:19 +0200 Subject: Patch to force linking of the Python module with CGAL. Upstream's method stopped working with CGAL 4.12. --- ...8-Force-linking-of-Python-module-with-CGAL.patch | 21 +++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 22 insertions(+) create mode 100644 debian/patches/0008-Force-linking-of-Python-module-with-CGAL.patch diff --git a/debian/patches/0008-Force-linking-of-Python-module-with-CGAL.patch b/debian/patches/0008-Force-linking-of-Python-module-with-CGAL.patch new file mode 100644 index 00000000..2b3a91ba --- /dev/null +++ b/debian/patches/0008-Force-linking-of-Python-module-with-CGAL.patch @@ -0,0 +1,21 @@ +From: Gard Spreemann +Date: Thu, 24 May 2018 11:24:43 +0200 +Subject: Force linking of Python module with CGAL. + +--- + cython/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cython/CMakeLists.txt b/cython/CMakeLists.txt +index ec3cb8f..87b2846 100644 +--- a/cython/CMakeLists.txt ++++ b/cython/CMakeLists.txt +@@ -103,7 +103,7 @@ if(CYTHON_FOUND) + if(CGAL_HEADER_ONLY) + set(GUDHI_CYTHON_EXTRA_COMPILE_ARGS "${GUDHI_CYTHON_EXTRA_COMPILE_ARGS}'-DCGAL_HEADER_ONLY', ") + else(CGAL_HEADER_ONLY) +- add_gudhi_cython_lib(${CGAL_LIBRARIES}) ++ add_gudhi_cython_lib("${CGAL_LIBRARIES_DIR}/libCGAL.so") + set(GUDHI_CYTHON_LIBRARY_DIRS "${GUDHI_CYTHON_LIBRARY_DIRS}'${CGAL_LIBRARIES_DIR}', ") + # If CGAL is not header only, CGAL library may link with boost system, + add_gudhi_cython_lib(${Boost_SYSTEM_LIBRARY}) diff --git a/debian/patches/series b/debian/patches/series index 6a2bbf20..6178386d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,3 +5,4 @@ 0005-Don-t-set-runtime_library_dirs-for-the-Python-extens.patch no-external-doc-resources.patch 0007-CGAL-4.12-compatibility.patch +0008-Force-linking-of-Python-module-with-CGAL.patch -- cgit v1.2.3