r36297 - in /packages/atlas/trunk/debian: TODO changelog control rules

sylvestre at users.alioth.debian.org sylvestre at users.alioth.debian.org
Tue Mar 23 13:57:11 UTC 2010 

Author: sylvestre
Date: Tue Mar 23 13:57:10 2010
New Revision: 36297

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36297
Log:
+atlas (3.8.3-15) experimental; urgency=low
+
+  * randomCrashOnBuild.diff was crashing many builds
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Mon, 22 Mar 2010 16:18:59 +0000
+
+atlas (3.8.3-14) experimental; urgency=low
+
+  * Might fix the random compilation bug. Thanks to R. Clint Whaley (upstream)
+    for the fix (randomCrashOnBuild.diff)
+  * Fix a useless dep on libatlas3gf-base from all optimized packages 
+    (not necessary)
+  * Explicit link against -lpthread added
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Sat, 20 Mar 2010 10:16:38 +0100



Modified:
    packages/atlas/trunk/debian/TODO
    packages/atlas/trunk/debian/changelog
    packages/atlas/trunk/debian/control
    packages/atlas/trunk/debian/rules

Modified: packages/atlas/trunk/debian/TODO
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/trunk/debian/TODO?rev=36297&op=diff
==============================================================================
--- packages/atlas/trunk/debian/TODO (original)
+++ packages/atlas/trunk/debian/TODO Tue Mar 23 13:57:10 2010
@@ -1,5 +1,4 @@
-
-* Check options on the different other archs
+* Check options on the different other archs (altivec)
 * See what will happen with AMD-optimized packages built under Intel CPU 
 
 * Provide -dbg packages

Modified: packages/atlas/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/trunk/debian/changelog?rev=36297&op=diff
==============================================================================
--- packages/atlas/trunk/debian/changelog (original)
+++ packages/atlas/trunk/debian/changelog Tue Mar 23 13:57:10 2010
@@ -1,3 +1,19 @@
+atlas (3.8.3-15) experimental; urgency=low
+
+  * randomCrashOnBuild.diff was crashing many builds
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Mon, 22 Mar 2010 16:18:59 +0000
+
+atlas (3.8.3-14) experimental; urgency=low
+
+  * Might fix the random compilation bug. Thanks to R. Clint Whaley (upstream)
+    for the fix (randomCrashOnBuild.diff)
+  * Fix a useless dep on libatlas3gf-base from all optimized packages 
+    (not necessary)
+  * Explicit link against -lpthread added
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Sat, 20 Mar 2010 10:16:38 +0100
+
 atlas (3.8.3-13) experimental; urgency=low
 
   * Support of hurd (hurd.diff)

Modified: packages/atlas/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/trunk/debian/control?rev=36297&op=diff
==============================================================================
--- packages/atlas/trunk/debian/control (original)
+++ packages/atlas/trunk/debian/control Tue Mar 23 13:57:10 2010
@@ -37,7 +37,6 @@
  will obtain the best performance by installing the package with the
  most advanced instruction extension set your machine is capable of
  running.
- . 
 
 Package: libatlas-base-dev
 Section: libdevel

Modified: packages/atlas/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/trunk/debian/rules?rev=36297&op=diff
==============================================================================
--- packages/atlas/trunk/debian/rules (original)
+++ packages/atlas/trunk/debian/rules Tue Mar 23 13:57:10 2010
@@ -1,12 +1,11 @@
 #!/usr/bin/make -f
-# Copyright 2008 Sylvestre Ledru <sylvestre.ledru at inria.fr>
+# Copyright 2008-2010 Sylvestre Ledru <sylvestre at debian.org>
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU)
 DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-export LD_LIBRARY_PATH=$(CURDIR)/debian/tmp/usr/lib/atlas-base/:/usr/lib/libfakeroot/
 
 CHECK_EXTENSIONS=""
 
@@ -38,6 +37,7 @@
 # 0 means Unknown CPU. Leave Atlas find out
 # 1 means no extension
 ARCHS=base_0_1
+DEB_SHLIBDEPS_INCLUDE_libatlas3gf-base := $(CURDIR)/debian/libatlas3gf-base/usr/lib/atlas-base/:$(CURDIR)/debian/libatlas3gf-base/usr/lib/atlas-base/atlas/
 
 ifeq ($(DEB_HOST_ARCH_CPU),i386)
 ifneq ($(DEB_BUILD_ARCH),kfreebsd-i386)
@@ -45,6 +45,10 @@
 endif
 ARCHS = base_10_1 sse_10_16 sse2_17_24 sse3_17_28 core2sse3_14_28
 # 10 = PII  17 = P4
+DEB_SHLIBDEPS_INCLUDE_libatlas3gf-sse = $(CURDIR)/debian/libatlas3gf-sse/usr/lib/atlas-sse:$(CURDIR)/debian/libatlas3gf-sse/usr/lib/atlas-sse/atlas
+DEB_SHLIBDEPS_INCLUDE_libatlas3gf-sse2 = $(CURDIR)/debian/libatlas3gf-sse2/usr/lib/atlas-sse2:$(CURDIR)/debian/libatlas3gf-sse2/usr/lib/atlas-sse2/atlas
+DEB_SHLIBDEPS_INCLUDE_libatlas3gf-sse3 = $(CURDIR)/debian/libatlas3gf-sse3/usr/lib/atlas-sse3:$(CURDIR)/debian/libatlas3gf-sse3/usr/lib/atlas-sse3/atlas
+DEB_SHLIBDEPS_INCLUDE_libatlas3gf-core2sse3 = $(CURDIR)/debian/libatlas3gf-core2sse3/usr/lib/atlas-core2sse3:$(CURDIR)/debian/libatlas3gf-core2sse3/usr/lib/atlas-core2sse3/atlas
 endif
 
 
@@ -52,6 +56,9 @@
 ifeq ($(DEB_HOST_ARCH_CPU),amd64)
 # 64 bits
 MODE_BITWIDTH = 64
+DEB_SHLIBDEPS_INCLUDE_libatlas3gf-amd64sse3 = $(CURDIR)/debian/libatlas3gf-amd64sse3/usr/lib/atlas-amd64sse3:$(CURDIR)/debian/libatlas3gf-amd64sse3/usr/lib/atlas-amd64sse3/atlas
+DEB_SHLIBDEPS_INCLUDE_libatlas3gf-core2sse3 = $(CURDIR)/debian/libatlas3gf-core2sse3/usr/lib/atlas-core2sse3:$(CURDIR)/debian/libatlas3gf-core2sse3/usr/lib/atlas-core2sse3/atlas
+DEB_SHLIBDEPS_INCLUDE_libatlas3gf-corei7sse3 = $(CURDIR)/debian/libatlas3gf-corei7sse3/usr/lib/atlas-corei7sse3:$(CURDIR)/debian/libatlas3gf-corei7sse3/usr/lib/atlas-corei7sse3/atlas
 ARCHS += amd64sse3_20_28 core2sse3_17_28 corei7sse3_18_28
 endif
 
@@ -59,17 +66,18 @@
 ifeq ($(DEB_HOST_ARCH_CPU),ppc64)
 # Power PC 64
 MODE_BITWIDTH = 64
-ARCHS += POWER464 POWER564
+ARCHS += altivec_3_2
+# 2 = altivec
 endif
 
 
 ifeq ($(DEB_HOST_ARCH_CPU),ppc)
 # Power PC 32
-ARCHS += POWER432
-endif
-
-
-# alpha ppc64
+ARCHS += altivec_3_2 
+# 2 = altivec
+endif
+
+# TODO: alpha hppa sparc
 
 GFORTRAN_LIB_PATH=`gcc -print-search-dirs|grep ^install:|awk '{print $$2}'`
 
@@ -81,7 +89,7 @@
 	-D c -DWALL 									\
 	-b $(MODE_BITWIDTH) 							\
 	-Fa alg '-Wa,--noexecstack -fPIC' 				\
-	-Ss f77lib "-L$(GFORTRAN_LIB_PATH) -lgfortran -lgcc_s"  \
+	-Ss f77lib "-L$(GFORTRAN_LIB_PATH) -lgfortran -lgcc_s -lpthread"  \
 	--with-netlib-lapack=/usr/lib/liblapack_pic.a 	\
 	-A $$atlasArch									\
 	-V $$atlasISA 									\
@@ -209,6 +217,9 @@
 		done
 
 install/libatlas-dev::
+	if test -d $(CURDIR)/debian/libatlas-dev/usr/include/; then \
+		rm -rf $(CURDIR)/debian/libatlas-dev/usr/include/;  \
+	fi
 	mkdir -p $(CURDIR)/debian/libatlas-dev/usr/include/
 	mv $(CURDIR)/debian/tmp/usr/include/*.h $(CURDIR)/debian/tmp/usr/include/atlas/
 	mv $(CURDIR)/debian/tmp/usr/include/atlas $(CURDIR)/debian/libatlas-dev/usr/include/
@@ -240,17 +251,6 @@
 		dh_md5sums -i
 		dh_builddeb -i
 
-binary-arch: build install
-		dh_testdir -a
-		dh_testroot -a
-		dh_installchangelogs  -a
-		dh_installexamples -a
-		dh_installman -a
-		dh_link -a
-		dh_compress  -a
-		dh_fixperms -a
-		dh_installdeb -a
-		dh_shlibdeps -a -l $$(pwd)
 
 .PHONY: build build-indep build-indep-stamp build-arch build-arch-stamp check clean binary binary-indep binary-arch configure-stamp configure custom custom-stamp

More information about the debian-science-commits mailing list