[SCM] efficient 2D data-plotting library branch, master, updated. debian/2.0.8.1-4-8-g5287b91

Picca Frédéric-Emmanuel picca at synchrotron-soleil.fr
Thu Feb 24 18:19:50 UTC 2011


The following commit has been merged in the master branch:
commit 9597a6c25f0e5aa2ea1b00e4c92f189e03637eb9
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date:   Tue Feb 22 22:40:23 2011 +0100

    * unapply the patch before switching to gbp-pq

diff --git a/debian/patches/local-options b/debian/patches/local-options
new file mode 100644
index 0000000..4aceb10
--- /dev/null
+++ b/debian/patches/local-options
@@ -0,0 +1 @@
+unapply-patches
diff --git a/setup.py b/setup.py
index c19e0d4..4a61257 100644
--- a/setup.py
+++ b/setup.py
@@ -99,14 +99,6 @@ if sphinx:
 
 from numpy.distutils.cpuinfo import cpu
 
-sse2_flag=""
-
-try:
-    if cpu._has_sse2():
-        sse2_flag="-msse2 "
-except KeyError:
-    pass
-
 setup(name=LIBNAME, version=version,
       download_url='http://%s.googlecode.com/files/%s-%s.zip' % (
                                                   LIBNAME, LIBNAME, version),
@@ -117,7 +109,7 @@ setup(name=LIBNAME, version=version,
       ext_modules=[Extension(LIBNAME+'._ext', [join("src", 'histogram.f')]),
                    Extension(LIBNAME+'._mandel', [join("src", 'mandel.f90')]),
                    Extension(LIBNAME+'._scaler', [join("src", "scaler.cpp")],
-                             extra_compile_args=[sse2_flag+"-Wall -Werror",],
+                             extra_compile_args=["-msse2 -Wall -Werror",],
                              depends=[join("src", "traits.hpp"),
                                       join("src", "points.hpp"),
                                       join("src", "arrays.hpp"),

-- 
efficient 2D data-plotting library



More information about the debian-science-commits mailing list