[minieigen] 01/04: Fix minieigen on python3, use proper linkage.
Anton Gladky
gladk at moszumanska.debian.org
Wed Oct 7 07:07:03 UTC 2015
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository minieigen.
commit bdc3901de71b125115eea9787f8e88509384ab20
Author: Anton Gladky <gladk at debian.org>
Date: Tue Oct 6 18:42:14 2015 +0200
Fix minieigen on python3, use proper linkage.
---
debian/patches/10_remove_embedded_double-conversion.patch | 11 ++++++-----
setup.py | 11 +----------
2 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/debian/patches/10_remove_embedded_double-conversion.patch b/debian/patches/10_remove_embedded_double-conversion.patch
index 83f28da..b254982 100644
--- a/debian/patches/10_remove_embedded_double-conversion.patch
+++ b/debian/patches/10_remove_embedded_double-conversion.patch
@@ -1,21 +1,22 @@
Description: Remove embedded double-conversion
Author: Anton Gladky <gladk at debian.org>
-Last-Update: 2015-05-12
+Last-Update: 2015-10-07
Index: minieigen/setup.py
===================================================================
--- minieigen.orig/setup.py
+++ minieigen/setup.py
-@@ -20,7 +20,7 @@ if sys.platform=='win32':
+@@ -19,8 +19,7 @@ if sys.platform=='win32':
+ # * https://bugs.launchpad.net/panda3d/+bug/919237
define_macros+=[('EIGEN_DONT_VECTORIZE',None)]
else:
- py3k=(sys.version_info[0]==3)
+- py3k=(sys.version_info[0]==3)
- libraries=['boost_python-py3%d'%sys.version_info[1] if py3k else 'boost_python']
-+ libraries=['boost_python', 'double-conversion']
++ libraries=['boost_python-py%d%d'%(sys.version_info[0],sys.version_info[1]), 'double-conversion']
library_dirs=[]
include_dirs=['/usr/include/eigen3','/usr/local/include/eigen3','minieigen']
-@@ -52,14 +52,6 @@ A small wrapper for core parts of Eigen
+@@ -52,14 +51,6 @@ A small wrapper for core parts of Eigen
'src/expose-matrices.cpp',
'src/expose-quaternion.cpp',
'src/expose-vectors.cpp',
diff --git a/setup.py b/setup.py
index f581551..6b51caa 100644
--- a/setup.py
+++ b/setup.py
@@ -19,8 +19,7 @@ if sys.platform=='win32':
# * https://bugs.launchpad.net/panda3d/+bug/919237
define_macros+=[('EIGEN_DONT_VECTORIZE',None)]
else:
- py3k=(sys.version_info[0]==3)
- libraries=['boost_python-py3%d'%sys.version_info[1] if py3k else 'boost_python']
+ libraries=['boost_python-py%d%d'%(sys.version_info[0],sys.version_info[1]), 'double-conversion']
library_dirs=[]
include_dirs=['/usr/include/eigen3','/usr/local/include/eigen3','minieigen']
@@ -52,14 +51,6 @@ A small wrapper for core parts of Eigen (http://eigen.tuxfamily.org), c++ librar
'src/expose-matrices.cpp',
'src/expose-quaternion.cpp',
'src/expose-vectors.cpp',
- 'src/double-conversion/bignum.cc',
- 'src/double-conversion/bignum-dtoa.cc',
- 'src/double-conversion/cached-powers.cc',
- 'src/double-conversion/diy-fp.cc',
- 'src/double-conversion/double-conversion.cc',
- 'src/double-conversion/fast-dtoa.cc',
- 'src/double-conversion/fixed-dtoa.cc',
- 'src/double-conversion/strtod.cc',
],
libraries=libraries,
library_dirs=library_dirs,
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/minieigen.git
More information about the debian-science-commits
mailing list