[pyfftw] 04/11: Fix FFTW detection patch.

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch master
in repository pyfftw.

commit 3d1363deec017f397c883da2c0874127e3f159e3
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Fri Jun 3 09:52:03 2016 +0100

    Fix FFTW detection patch.
    
    Gbp-Dch: Short
    Closes: #826036
    Thanks: Marten van Kerkwijk for reporting the issue.
---
 .../patches/Detect-fftw-libraries-using-pkgconfig.patch   | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/debian/patches/Detect-fftw-libraries-using-pkgconfig.patch b/debian/patches/Detect-fftw-libraries-using-pkgconfig.patch
index 75ba031..1923924 100644
--- a/debian/patches/Detect-fftw-libraries-using-pkgconfig.patch
+++ b/debian/patches/Detect-fftw-libraries-using-pkgconfig.patch
@@ -3,22 +3,21 @@ 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(-)
+ setup.py | 6 ++++--
+ 1 file changed, 4 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():
+@@ -120,8 +120,10 @@
          libraries = ['libfftw3-3', 'libfftw3f-3', 'libfftw3l-3']
  
      else:
--        libraries = ['fftw3', 'fftw3f', 'fftw3l', 'fftw3_threads', 
+-        libraries = ['fftw3', 'fftw3f', 'fftw3l', 'fftw3_threads',
 -                     'fftw3f_threads', 'fftw3l_threads']
 +        import pkgconfig
-+        libraries = [lib for lib in ("fftw3", "fftw3f", "fftw3l") \
-+                     if pkgconfig.exists(lib)]
++        libraries = ['fftw3', 'fftw3_threads', 'fftw3f', 'fftw3f_threads']
++        if pkgconfig.exists('fftw3l'):
++            libraries.extend(['fftw3l', 'fftw3l_threads'])
  
      return libraries
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pyfftw.git