This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to branch master
in repository pyfftw.
commit 3b76e7984904d7dac7f74e76ad978a5cb4317e12
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date: Sat Jan 30 17:22:06 2016 +0000
Update patch queue:
- Drop patch arm-build.diff.
- Discover fftw libraries using pkgconfig.
- Add build dependency on python{3}-pkgconfig.
Gbp-Dch: Short
Closes: #746998
Thanks: Aurelien Jarno
---
debian/control | 2 ++
.../Detect-fftw-libraries-using-pkgconfig.patch | 24 ++++++++++++++++++++++
debian/patches/arm-build.diff | 21 -------------------
debian/patches/series | 2 +-
4 files changed, 27 insertions(+), 22 deletions(-)
diff --git a/debian/control b/debian/control
index fd6ed34..fcfe680 100644
--- a/debian/control
+++ b/debian/control
@@ -13,6 +13,7 @@ Build-Depends:
python-all-dev,
python-numpy,
python-numpy-dbg,
+ python-pkgconfig,
python-setuptools,
cython3,
cython3-dbg,
@@ -20,6 +21,7 @@ Build-Depends:
python3-all-dev,
python3-numpy,
python3-numpy-dbg,
+ python3-pkgconfig,
python3-setuptools
Standards-Version: 3.9.6
Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/pyfftw.git
diff --git a/debian/patches/Detect-fftw-libraries-using-pkgconfig.patch b/debian/patches/Detect-fftw-libraries-using-pkgconfig.patch
new file mode 100644
index 0000000..75ba031
--- /dev/null
+++ b/debian/patches/Detect-fftw-libraries-using-pkgconfig.patch
@@ -0,0 +1,24 @@
+From: Ghislain Antony Vaillant <ghisvail at gmail.com>
+Date: Mon, 1 Feb 2016 23:08:52 +0000
+Subject: Detect fftw libraries using pkgconfig.
+
+---
+ setup.py | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 562540c..065289b 100644
+--- a/setup.py
++++ b/setup.py
+@@ -93,8 +93,9 @@ def get_libraries():
+ libraries = ['libfftw3-3', 'libfftw3f-3', 'libfftw3l-3']
+
+ else:
+- libraries = ['fftw3', 'fftw3f', 'fftw3l', 'fftw3_threads',
+- 'fftw3f_threads', 'fftw3l_threads']
++ import pkgconfig
++ libraries = [lib for lib in ("fftw3", "fftw3f", "fftw3l") \
++ if pkgconfig.exists(lib)]
+
+ return libraries
+
diff --git a/debian/patches/arm-build.diff b/debian/patches/arm-build.diff
deleted file mode 100644
index 7e667bb..0000000
--- a/debian/patches/arm-build.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: fix build on arm, avoid linking with ldouble FFTW
-Author: Matthias Klose <doko at ubuntu.com>
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=779724
-Last-Update: 2015-03-04
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/setup.py
-+++ b/setup.py
-@@ -64,8 +64,10 @@
- package_data['pyfftw'] = [
- 'libfftw3-3.dll', 'libfftw3l-3.dll', 'libfftw3f-3.dll']
- else:
-- libraries = ['fftw3', 'fftw3f', 'fftw3l', 'fftw3_threads',
-- 'fftw3f_threads', 'fftw3l_threads']
-+ libraries = ['fftw3', 'fftw3f', 'fftw3_threads',
-+ 'fftw3f_threads']
-+ if not get_platform().startswith('linux-arm'):
-+ libraries.extend(['fftw3l', 'fftw3l_threads'])
-
- class custom_build_ext(build_ext):
- def finalize_options(self):
diff --git a/debian/patches/series b/debian/patches/series
index 6b47952..70f1ab5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-arm-build.diff
+Detect-fftw-libraries-using-pkgconfig.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pyfftw.git