r38633 - in /packages/openblas/trunk/debian: changelog patches/hurd_gettid.diff rules

[sylvestre at users.alioth.debian.org]

Author: sylvestre
Date: Tue Jul 26 16:34:37 2011
New Revision: 38633

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=38633
Log:
  * Disable dynamic arch on non amd64 / i386 archs (Closes: #631887)
  * Fix a FTBFS under hurd

Added:
    packages/openblas/trunk/debian/patches/hurd_gettid.diff
Modified:
    packages/openblas/trunk/debian/changelog
    packages/openblas/trunk/debian/rules

Modified: packages/openblas/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/openblas/trunk/debian/changelog?rev=38633&op=diff
==============================================================================
--- packages/openblas/trunk/debian/changelog (original)
+++ packages/openblas/trunk/debian/changelog Tue Jul 26 16:34:37 2011
@@ -1,3 +1,10 @@
+openblas (0.1alpha2.2-2) unstable; urgency=low
+
+  * Disable dynamic arch on non amd64 / i386 archs (Closes: #631887)
+  * Fix a FTBFS under hurd
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Tue, 26 Jul 2011 16:56:27 +0200
+
 openblas (0.1alpha2.2-1) unstable; urgency=low
 
   * New upstream release (Closes: #631886)

Added: packages/openblas/trunk/debian/patches/hurd_gettid.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/openblas/trunk/debian/patches/hurd_gettid.diff?rev=38633&op=file
==============================================================================
--- packages/openblas/trunk/debian/patches/hurd_gettid.diff (added)
+++ packages/openblas/trunk/debian/patches/hurd_gettid.diff Tue Jul 26 16:34:37 2011
@@ -1,0 +1,19 @@
+Index: openblas-0.1alpha2.2/common_linux.h
+===================================================================
+--- openblas-0.1alpha2.2.orig/common_linux.h	2011-07-26 16:39:34.000000000 +0200
++++ openblas-0.1alpha2.2/common_linux.h	2011-07-26 16:41:03.000000000 +0200
+@@ -78,7 +78,13 @@
+   return syscall(SYS_set_mempolicy, mode, addr, flag);
+ }
+ 
+-static inline int my_gettid(void) { return syscall(SYS_gettid); }
++static inline int my_gettid(void) { 
++#ifdef SYS_gettid
++return syscall(SYS_gettid); 
++#else
++return getpid();
++#endif
++}
+ 
+ #endif
+ #endif

Modified: packages/openblas/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/openblas/trunk/debian/rules?rev=38633&op=diff
==============================================================================
--- packages/openblas/trunk/debian/rules (original)
+++ packages/openblas/trunk/debian/rules Tue Jul 26 16:34:37 2011
@@ -4,13 +4,17 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 
 COMMON_MAKE_OPTIONS = "NO_LAPACK=1"
+ENABLE_DYNAMIC_ARCHS := amd64 i386 kfreebsd-amd64 kfreebsd-i386
+ifneq (,$(findstring $(DEB_HOST_ARCH),$(ENABLE_DYNAMIC_ARCHS)))
+	DYNAMIC_ARCH_ARG="DYNAMIC_ARCH=1"
+endif
 
 build: build-stamp
 
 build-stamp:
 	if test "$(TARGET)" = ""; then 		\
-			echo "Support multiple architecture"; \
-			$(MAKE) $(COMMON_MAKE_OPTIONS) DYNAMIC_ARCH=1;		\
+			echo "Support multiple architectures"; \
+			$(MAKE) $(COMMON_MAKE_OPTIONS) $(DYNAMIC_ARCH_ARG);		\
 	fi
 
 	if test "$(TARGET)" = "custom"; then 		\