summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog7
-rw-r--r--debian/patches/0003-Don-t-set-runtime-library-dirs-for-Python-extensions.patch21
-rw-r--r--debian/patches/series1
-rwxr-xr-xdebian/rules4
4 files changed, 9 insertions, 24 deletions
diff --git a/debian/changelog b/debian/changelog
index f8bd0747..387a0c15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gudhi (3.0.0+dfsg-4) UNRELEASED; urgency=medium
+
+ * Drop 0003-Don-t-set-runtime-library-dirs-for-Python-extensions.patch
+ in favor of CMake option.
+
+ -- Gard Spreemann <gspr@nonempty.org> Fri, 08 Nov 2019 21:15:16 +0100
+
gudhi (3.0.0+dfsg-3) unstable; urgency=medium
* Disable build-time tests on i386 and s390x.
diff --git a/debian/patches/0003-Don-t-set-runtime-library-dirs-for-Python-extensions.patch b/debian/patches/0003-Don-t-set-runtime-library-dirs-for-Python-extensions.patch
deleted file mode 100644
index f5c6e30d..00000000
--- a/debian/patches/0003-Don-t-set-runtime-library-dirs-for-Python-extensions.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Gard Spreemann <gspr@nonempty.org>
-Date: Wed, 25 Sep 2019 15:14:52 +0200
-Subject: Don't set runtime library dirs for Python extensions.
-
----
- src/python/setup.py.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/python/setup.py.in b/src/python/setup.py.in
-index 3f1d442..1011f38 100644
---- a/src/python/setup.py.in
-+++ b/src/python/setup.py.in
-@@ -24,7 +24,7 @@ extra_link_args=[@GUDHI_PYTHON_EXTRA_LINK_ARGS@]
- libraries=[@GUDHI_PYTHON_LIBRARIES@]
- library_dirs=[@GUDHI_PYTHON_LIBRARY_DIRS@]
- include_dirs = [numpy_get_include(), '@CMAKE_CURRENT_SOURCE_DIR@/gudhi/', @GUDHI_PYTHON_INCLUDE_DIRS@]
--runtime_library_dirs=[@GUDHI_PYTHON_RUNTIME_LIBRARY_DIRS@]
-+runtime_library_dirs=[]
-
- # Create ext_modules list from module list
- ext_modules = []
diff --git a/debian/patches/series b/debian/patches/series
index fbaa9d8a..aa30d9dc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
0001-Disable-tests-that-use-DFSG-deleted-data-files.patch
0002-Use-system-MathJax.patch
-0003-Don-t-set-runtime-library-dirs-for-Python-extensions.patch
0004-Force-linking-of-Python-module-with-CGAL.patch
0005-Force-linking-against-libatomic-for-parts-that-use-T.patch
0006-Offline-header-for-docs.patch
diff --git a/debian/rules b/debian/rules
index 759a7ceb..c10ca7fa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,9 +35,9 @@ endif
done
override_dh_auto_configure:
- dh_auto_configure $(DHFLAGS) -- -DWITH_GUDHI_BENCHMARK=true -DWITH_GUDHI_EXAMPLE=true -DWITH_GUDHI_PYTHON=true -DWITH_GUDHI_TEST=true -DWITH_GUDHI_UTILITIES=true -DPython_ADDITIONAL_VERSIONS=$(DEFAULT_PY3VER) -DUSER_VERSION_DIR=gudhi
+ dh_auto_configure $(DHFLAGS) -- -DWITH_GUDHI_BENCHMARK=true -DWITH_GUDHI_EXAMPLE=true -DWITH_GUDHI_PYTHON=true -DWITH_GUDHI_TEST=true -DWITH_GUDHI_UTILITIES=true -DPython_ADDITIONAL_VERSIONS=$(DEFAULT_PY3VER) -DUSER_VERSION_DIR=gudhi -DWITH_GUDHI_PYTHON_RUNTIME_LIBRARY_DIRS=false
for py3ver in $(REMAINING_PY3VERS) ; do \
- dh_auto_configure $(DHFLAGS) --builddirectory=build$$py3ver -- -DWITH_GUDHI_BENCHMARK=false -DWITH_GUDHI_EXAMPLE=false -DWITH_GUDHI_PYTHON=true -DWITH_GUDHI_TEST=true -DWITH_GUDHI_UTILITIES=false -DPython_ADDITIONAL_VERSIONS=$$py3ver ; \
+ dh_auto_configure $(DHFLAGS) --builddirectory=build$$py3ver -- -DWITH_GUDHI_BENCHMARK=false -DWITH_GUDHI_EXAMPLE=false -DWITH_GUDHI_PYTHON=true -DWITH_GUDHI_TEST=true -DWITH_GUDHI_UTILITIES=false -DPython_ADDITIONAL_VERSIONS=$$py3ver -DWITH_GUDHI_PYTHON_RUNTIME_LIBRARY_DIRS=false ; \
done
override_dh_auto_build-arch: