[Python-modules-commits] r4017 - in packages/numpy/trunk/debian (3 files)

[kumanna-guest at users.alioth.debian.org]

    Date: Saturday, December 22, 2007 @ 16:53:17
  Author: kumanna-guest
Revision: 4017

* debian/patches:
  + 02_dontuse_lapack.diff: Patch system_info.py not to look for
    Atlas, as we want to build against the reference BLAS and
    LAPACK (refblas3-dev and lapack3-dev) even when Atlas is around.
    (Closes: #448530, #457329)

Added:
  packages/numpy/trunk/debian/patches/02_dontuse_lapack.diff
Modified:
  packages/numpy/trunk/debian/changelog
  packages/numpy/trunk/debian/patches/series

Modified: packages/numpy/trunk/debian/changelog
===================================================================
--- packages/numpy/trunk/debian/changelog	2007-12-22 14:21:57 UTC (rev 4016)
+++ packages/numpy/trunk/debian/changelog	2007-12-22 16:53:17 UTC (rev 4017)
@@ -1,8 +1,12 @@
-python-numpy (1:1.0.4-4) UNRELEASED; urgency=low
+python-numpy (1:1.0.4-4) unstable; urgency=medium
 
-  * NOT YET RELEASED.
+  * debian/patches:
+    + 02_dontuse_lapack.diff: Patch system_info.py not to look for
+      Atlas, as we want to build against the reference BLAS and
+      LAPACK (refblas3-dev and lapack3-dev) even when Atlas is around.
+      (Closes: #448530, #457329)
   
- -- Kumar Appaiah <akumar at ee.iitm.ac.in>  Thu, 20 Dec 2007 14:53:53 +0530
+ -- Kumar Appaiah <akumar at ee.iitm.ac.in>  Sat, 22 Dec 2007 22:19:32 +0530
 
 python-numpy (1:1.0.4-3) unstable; urgency=low
 

Added: packages/numpy/trunk/debian/patches/02_dontuse_lapack.diff
===================================================================
--- packages/numpy/trunk/debian/patches/02_dontuse_lapack.diff	                        (rev 0)
+++ packages/numpy/trunk/debian/patches/02_dontuse_lapack.diff	2007-12-22 16:53:17 UTC (rev 4017)
@@ -0,0 +1,61 @@
+Patch to prevent Atlas from being detected during the build, as we
+want to depend on the reference BLAS and LAPACK even when Atlas is
+around.
+
+Kumar Appaiah <akumar at ee.iitm.ac.in>
+Index: b/numpy/distutils/system_info.py
+===================================================================
+--- a/numpy/distutils/system_info.py
++++ b/numpy/distutils/system_info.py
+@@ -879,21 +879,21 @@
+         atlas = None
+         lapack = None
+         atlas_1 = None
+-        for d in lib_dirs:
+-            atlas = self.check_libs2(d,atlas_libs,[])
+-            lapack_atlas = self.check_libs2(d,['lapack_atlas'],[])
+-            if atlas is not None:
+-                lib_dirs2 = [d] + self.combine_paths(d,['atlas*','ATLAS*'])
+-                for d2 in lib_dirs2:
+-                    lapack = self.check_libs2(d2,lapack_libs,[])
+-                    if lapack is not None:
+-                        break
+-                else:
+-                    lapack = None
+-                if lapack is not None:
+-                    break
+-            if atlas:
+-                atlas_1 = atlas
++#         for d in lib_dirs:
++#             atlas = self.check_libs2(d,atlas_libs,[])
++#             lapack_atlas = self.check_libs2(d,['lapack_atlas'],[])
++#             if atlas is not None:
++#                 lib_dirs2 = [d] + self.combine_paths(d,['atlas*','ATLAS*'])
++#                 for d2 in lib_dirs2:
++#                     lapack = self.check_libs2(d2,lapack_libs,[])
++#                     if lapack is not None:
++#                         break
++#                 else:
++#                     lapack = None
++#                 if lapack is not None:
++#                     break
++#             if atlas:
++#                 atlas_1 = atlas
+         log.info(self.__class__)
+         if atlas is None:
+             atlas = atlas_1
+@@ -967,10 +967,10 @@
+         atlas_libs = self.get_libs('atlas_libs',
+                                    self._lib_names + self._lib_atlas)
+         atlas = None
+-        for d in lib_dirs:
+-            atlas = self.check_libs2(d,atlas_libs,[])
+-            if atlas is not None:
+-                break
++#         for d in lib_dirs:
++#             atlas = self.check_libs2(d,atlas_libs,[])
++#             if atlas is not None:
++#                 break
+         if atlas is None:
+             return
+         include_dirs = self.get_include_dirs()

Modified: packages/numpy/trunk/debian/patches/series
===================================================================
--- packages/numpy/trunk/debian/patches/series	2007-12-22 14:21:57 UTC (rev 4016)
+++ packages/numpy/trunk/debian/patches/series	2007-12-22 16:53:17 UTC (rev 4017)
@@ -1 +1,2 @@
 01_fix_man_hyphens.patch
+02_dontuse_lapack.diff