[libfann] 115/133: Added patch 0007-Do-not-call-swig-unconditionally

[Christian Kastner]

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

chrisk-guest pushed a commit to branch master
in repository libfann.

commit d1680fba7104d8d7a5a19241c79545cad25df8cd
Author: Christian Kastner <debian at kvr.at>
Date:   Mon Mar 3 01:33:13 2014 +0100

    Added patch 0007-Do-not-call-swig-unconditionally
---
 .../0007-Do-not-call-swig-unconditionally.patch    | 44 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 45 insertions(+)

diff --git a/debian/patches/0007-Do-not-call-swig-unconditionally.patch b/debian/patches/0007-Do-not-call-swig-unconditionally.patch
new file mode 100644
index 0000000..52c016d
--- /dev/null
+++ b/debian/patches/0007-Do-not-call-swig-unconditionally.patch
@@ -0,0 +1,44 @@
+From: Christian Kastner <debian at kvr.at>
+Date: Mon, 3 Mar 2014 01:29:39 +0100
+Subject: Do not call swig unconditionally
+
+every time setup.py is used, especially when using setup.py install.
+The bug upstream refers to is not reproducible here.
+---
+ python/setup.py | 13 +++----------
+ 1 file changed, 3 insertions(+), 10 deletions(-)
+
+Index: libfann-2.1.0~beta~dfsg/python/setup.py
+===================================================================
+--- libfann-2.1.0~beta~dfsg.orig/python/setup.py	2014-03-03 02:04:00.000000000 +0100
++++ libfann-2.1.0~beta~dfsg/python/setup.py	2014-03-03 17:29:44.288988000 +0100
+@@ -19,11 +19,6 @@
+ documented, and fast. 
+ """
+ 
+-#These lines are needed to circumvent a bug in distutils
+-swig_cmd = 'swig -c++ -python pyfann/pyfann.i'
+-print 'Running SWIG before:', swig_cmd
+-os.system(swig_cmd)
+-
+ #This utility function searches for files
+ def hunt_files(root, which):
+     return glob.glob(os.path.join(root, which))
+@@ -40,11 +35,12 @@
+     url='http://sourceforge.net/projects/fann/',
+     license='GNU LESSER GENERAL PUBLIC LICENSE (LGPL)',
+     py_modules=['pyfann.libfann'],
+-    ext_modules=[Extension('pyfann._libfann',['pyfann/pyfann_wrap.cxx'], 
+-                            include_dirs=['../src/include'], 
+-                            extra_objects=['../src/.libs/doublefann.o'],
+-                            define_macros=[("SWIG_COMPILE",None)]
+-                            ),
++    ext_modules=[Extension('pyfann._libfann',['pyfann/pyfann.i'],
++                            swig_opts=['-c++', '-I../src/include'],
++                            include_dirs=['../src/include'],
++                            library_dirs=['../src/.libs/'],
++                            libraries=['doublefann']
++                            )
+                 ]
+ )
+ 
diff --git a/debian/patches/series b/debian/patches/series
index b68c131..1438e66 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 0004-Portable-handling-for-va_list.patch
 0005-Correct-a-typo-in-a-size-comparison.patch
 0006-Include-fann_cpp.h-in-dev-package.patch
+0007-Do-not-call-swig-unconditionally.patch

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