r38538 - in /packages/openblas/trunk/debian: changelog control patches/hurd.diff patches/kfreebsd.diff patches/series patches/sparc.diff patches/unsupportedarch.diff

sylvestre at users.alioth.debian.org sylvestre at users.alioth.debian.org
Mon May 30 21:47:32 UTC 2011 

Author: sylvestre
Date: Mon May 30 21:47:31 2011
New Revision: 38538

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=38538
Log:
openblas (0.1alpha1-4) experimental; urgency=low

  * Fix FTBFS under kfreebsd, sparc & hurd.
  * Limit architectures to amd64 i386 ia64 powerpc powerpcspe ppc64
    kfreebsd-i386 kfreebsd-amd64 hurd-i386 sparc
  * cherry-pick from upstream to fail build when the arch is not supported

Added:
    packages/openblas/trunk/debian/patches/hurd.diff
    packages/openblas/trunk/debian/patches/kfreebsd.diff
    packages/openblas/trunk/debian/patches/unsupportedarch.diff
Modified:
    packages/openblas/trunk/debian/changelog
    packages/openblas/trunk/debian/control
    packages/openblas/trunk/debian/patches/series
    packages/openblas/trunk/debian/patches/sparc.diff

Modified: packages/openblas/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/openblas/trunk/debian/changelog?rev=38538&op=diff
==============================================================================
--- packages/openblas/trunk/debian/changelog (original)
+++ packages/openblas/trunk/debian/changelog Mon May 30 21:47:31 2011
@@ -1,3 +1,12 @@
+openblas (0.1alpha1-4) experimental; urgency=low
+
+  * Fix FTBFS under kfreebsd, sparc & hurd.
+  * Limit architectures to amd64 i386 ia64 powerpc powerpcspe ppc64
+    kfreebsd-i386 kfreebsd-amd64 hurd-i386 sparc
+  * cherry-pick from upstream to fail build when the arch is not supported
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Mon, 30 May 2011 17:05:23 +0200
+
 openblas (0.1alpha1-3) experimental; urgency=low
 
   * clean target now really cleans everything. Thanks to Ryan Lovett

Modified: packages/openblas/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/openblas/trunk/debian/control?rev=38538&op=diff
==============================================================================
--- packages/openblas/trunk/debian/control (original)
+++ packages/openblas/trunk/debian/control Mon May 30 21:47:31 2011
@@ -11,7 +11,7 @@
 
 Package: libopenblas-base
 Section: libs
-Architecture: any
+Architecture: amd64 i386 ia64 powerpc powerpcspe ppc64 kfreebsd-i386 kfreebsd-amd64 hurd-i386 sparc
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Provides: libblas.so.3gf
 Suggests: ${libs:Suggests}, liblapack3gf
@@ -27,7 +27,7 @@
 
 Package: libopenblas-dev
 Section: libdevel
-Architecture: any
+Architecture: amd64 i386 ia64 powerpc powerpcspe ppc64 kfreebsd-i386 kfreebsd-amd64 hurd-i386 sparc
 Depends: libopenblas-base (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Provides: libblas-3gf.so
 Suggests: liblapack-dev

Added: packages/openblas/trunk/debian/patches/hurd.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/openblas/trunk/debian/patches/hurd.diff?rev=38538&op=file
==============================================================================
--- packages/openblas/trunk/debian/patches/hurd.diff (added)
+++ packages/openblas/trunk/debian/patches/hurd.diff Mon May 30 21:47:31 2011
@@ -1,0 +1,16 @@
+Index: openblas-0.1alpha1/ctest.c
+===================================================================
+--- openblas-0.1alpha1.orig/ctest.c	2011-05-30 17:02:35.000000000 +0200
++++ openblas-0.1alpha1/ctest.c	2011-05-30 17:04:39.000000000 +0200
+@@ -70,6 +70,11 @@
+ OS_INTERIX
+ #endif
+ 
++#if defined(__gnu_hurd__)
++/* Hurd is very similar to GNU/Linux, it should work out of the box */
++OS_LINUX
++#endif
++
+ #if defined(__i386) || defined(_X86)
+ ARCH_X86
+ #endif

Added: packages/openblas/trunk/debian/patches/kfreebsd.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/openblas/trunk/debian/patches/kfreebsd.diff?rev=38538&op=file
==============================================================================
--- packages/openblas/trunk/debian/patches/kfreebsd.diff (added)
+++ packages/openblas/trunk/debian/patches/kfreebsd.diff Mon May 30 21:47:31 2011
@@ -1,0 +1,21 @@
+--- openblas-0.1alpha1.orig/ctest.c	2011-05-30 14:55:26.000000000 +0000
++++ openblas-0.1alpha1/ctest.c	2011-05-30 14:55:20.000000000 +0000
+@@ -34,7 +34,7 @@
+ OS_LINUX
+ #endif
+ 
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ OS_FreeBSD
+ #endif
+ 
+--- openblas-0.1alpha1.orig/f_check	2011-05-30 14:55:26.000000000 +0000
++++ openblas-0.1alpha1/f_check	2011-05-30 14:55:20.000000000 +0000
+@@ -274,6 +274,7 @@ if ($link ne "") {
+ 	    && ($flags !~ /kernel32/)
+ 	    && ($flags !~ /advapi32/)
+ 	    && ($flags !~ /shell32/)
++		&& ($flags !~ /^\-l$/)
+ 	    ) {
+ 	    $linker_l .= $flags . " ";
+ 	}

Modified: packages/openblas/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/openblas/trunk/debian/patches/series?rev=38538&op=diff
==============================================================================
--- packages/openblas/trunk/debian/patches/series (original)
+++ packages/openblas/trunk/debian/patches/series Mon May 30 21:47:31 2011
@@ -1,1 +1,4 @@
 sparc.diff
+kfreebsd.diff
+hurd.diff
+unsupportedarch.diff

Modified: packages/openblas/trunk/debian/patches/sparc.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/openblas/trunk/debian/patches/sparc.diff?rev=38538&op=diff
==============================================================================
--- packages/openblas/trunk/debian/patches/sparc.diff (original)
+++ packages/openblas/trunk/debian/patches/sparc.diff Mon May 30 21:47:31 2011
@@ -1,5 +1,3 @@
-Index: openblas-0.1alpha1/param.h
-===================================================================
 --- openblas-0.1alpha1.orig/param.h	2011-04-16 13:20:12.000000000 +0000
 +++ openblas-0.1alpha1/param.h	2011-04-16 13:20:29.000000000 +0000
 @@ -1404,7 +1404,7 @@
@@ -11,3 +9,14 @@
  
  #define SNUMOPT		2
  #define DNUMOPT		2
+--- openblas-0.1alpha1.orig/driver/others/memory.c
++++ openblas-0.1alpha1/driver/others/memory.c
+@@ -1128,7 +1128,7 @@ static BLASULONG   init_lock = 0UL;
+ static void _touch_memory(blas_arg_t *arg, BLASLONG *range_m, BLASLONG *range_n, 
+ 			  void *sa, void *sb, BLASLONG pos) {
+ 
+-#ifndef ARCH_POWER
++#if !defined(ARCH_POWER) && !defined(ARCH_SPARC)
+ 
+   long size;
+   BLASULONG buffer;

Added: packages/openblas/trunk/debian/patches/unsupportedarch.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/openblas/trunk/debian/patches/unsupportedarch.diff?rev=38538&op=file
==============================================================================
--- packages/openblas/trunk/debian/patches/unsupportedarch.diff (added)
+++ packages/openblas/trunk/debian/patches/unsupportedarch.diff Mon May 30 21:47:31 2011
@@ -1,0 +1,46 @@
+diff --git a/getarch.c b/getarch.c
+index 1d9bbc1..8864753 100644
+--- a/getarch.c
++++ b/getarch.c
+@@ -604,30 +604,41 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #ifndef POWER
+ #define POWER
+ #endif
++#define OPENBLAS_SUPPORTED
+ #endif
+ 
+ #if defined(__i386__) || (__x86_64__)
+ #include "cpuid_x86.c"
++#define OPENBLAS_SUPPORTED
+ #endif
+ 
+ #ifdef __ia64__
+ #include "cpuid_ia64.c"
++#define OPENBLAS_SUPPORTED
+ #endif
+ 
+ #ifdef __alpha
+ #include "cpuid_alpha.c"
++#define OPENBLAS_SUPPORTED
+ #endif
+ 
+ #ifdef POWER
+ #include "cpuid_power.c"
++#define OPENBLAS_SUPPORTED
+ #endif
+ 
+ #ifdef sparc
+ #include "cpuid_sparc.c"
++#define OPENBLAS_SUPPORTED
+ #endif
+ 
+ #ifdef __mips__
+ #include "cpuid_mips.c"
++#define OPENBLAS_SUPPORTED
++#endif
++
++#ifndef OPENBLAS_SUPPORTED
++#error "This arch/CPU is not supported by OpenBLAS."
+ #endif
+ 
+ #else

More information about the debian-science-commits mailing list