r36879 - in /packages/atlas/trunk/debian: README.Debian changelog control patches/03_full_blas_lapack.diff rules

sylvestre at users.alioth.debian.org sylvestre at users.alioth.debian.org
Sun Sep 5 21:27:21 UTC 2010 

Author: sylvestre
Date: Sun Sep  5 21:27:13 2010
New Revision: 36879

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36879
Log:
  * Fix a build issue with 64 archs. This issue has been introduced by upload
    3.8.3-25

 -- Sylvestre Ledru <sylvestre at debian.org>  Sun, 05 Sep 2010 13:06:51 +0200

atlas (3.8.3-26) unstable; urgency=low

  * Fix a bug on localized system. For example, the custom build failed on a 
    russian (ru_RU) system. Thanks to Damir Islamov for providing the fix.
  * Provide more information on how to rebuild custom packages in 
    README.Debian
  * Provide multithreaded Atlas libraries by default. Many thanks to
    Dirk Eddelbuettel for the patch. (Closes: #595326)
  * Standards-Version updated to version 3.9.1

Modified:
    packages/atlas/trunk/debian/README.Debian
    packages/atlas/trunk/debian/changelog
    packages/atlas/trunk/debian/control
    packages/atlas/trunk/debian/patches/03_full_blas_lapack.diff
    packages/atlas/trunk/debian/rules

Modified: packages/atlas/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/trunk/debian/README.Debian?rev=36879&op=diff
==============================================================================
--- packages/atlas/trunk/debian/README.Debian (original)
+++ packages/atlas/trunk/debian/README.Debian Sun Sep  5 21:27:13 2010
@@ -46,6 +46,9 @@
 
 which should be optimized for the architecture Atlas has been built on.
 
+All dependencies can be installed with the following command:
+# aptitude install build-essential dpkg-dev cdbs devscritps gfortran \
+ liblapack-dev, liblapack-pic, texlive-latex-base
 
 How to load optimized/custom atlas libraries
 ============================================

Modified: packages/atlas/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/trunk/debian/changelog?rev=36879&op=diff
==============================================================================
--- packages/atlas/trunk/debian/changelog (original)
+++ packages/atlas/trunk/debian/changelog Sun Sep  5 21:27:13 2010
@@ -1,3 +1,22 @@
+atlas (3.8.3-27) unstable; urgency=low
+
+  * Fix a build issue with 64 archs. This issue has been introduced by upload
+    3.8.3-25
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Sun, 05 Sep 2010 13:06:51 +0200
+
+atlas (3.8.3-26) unstable; urgency=low
+
+  * Fix a bug on localized system. For example, the custom build failed on a 
+    russian (ru_RU) system. Thanks to Damir Islamov for providing the fix.
+  * Provide more information on how to rebuild custom packages in 
+    README.Debian
+  * Provide multithreaded Atlas libraries by default. Many thanks to
+    Dirk Eddelbuettel for the patch. (Closes: #595326)
+  * Standards-Version updated to version 3.9.1
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Sat, 04 Sep 2010 00:46:03 +0200
+
 atlas (3.8.3-25) unstable; urgency=low
 
   * Drop all optimized packages.

Modified: packages/atlas/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/trunk/debian/control?rev=36879&op=diff
==============================================================================
--- packages/atlas/trunk/debian/control (original)
+++ packages/atlas/trunk/debian/control Sun Sep  5 21:27:13 2010
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Sylvestre Ledru <sylvestre at debian.org>
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
 Build-Depends: debhelper (>= 7), patch, gfortran, libblas-dev, 
  liblapack-dev, liblapack-pic, libblas-test, cdbs, texlive-latex-base, 
  ghostscript, cpufrequtils

Modified: packages/atlas/trunk/debian/patches/03_full_blas_lapack.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/trunk/debian/patches/03_full_blas_lapack.diff?rev=36879&op=diff
==============================================================================
--- packages/atlas/trunk/debian/patches/03_full_blas_lapack.diff (original)
+++ packages/atlas/trunk/debian/patches/03_full_blas_lapack.diff Sun Sep  5 21:27:13 2010
@@ -36,11 +36,11 @@
  	ld $(LDFLAGS) -shared -soname $@ -o $@ --whole-archive libcblas.a
 +
 +# Build full netlib blas/lapack libraries:
-+atlas/libblas.a: libatlas.a libf77blas.a libcblas.a
++atlas/libblas.a: libatlas.a libptf77blas.a libptcblas.a
 +	mkdir tmp
 +	(cd tmp && ar x ../libatlas.a);
-+	(cd tmp && ar x ../libf77blas.a);
-+	(cd tmp && ar x ../libcblas.a);
++	(cd tmp && ar x ../libptf77blas.a);
++	(cd tmp && ar x ../libptcblas.a);
 +	ar r $@ tmp/*.o
 +	rm -rf tmp
 +
@@ -48,7 +48,7 @@
 +	mkdir tmp
 +	(cd tmp && ar x /usr/lib/liblapack_pic.a);
 +	(cd tmp && ar x ../liblapack_atlas.a);
-+	(cd tmp && ar x ../libcblas.a);
++	(cd tmp && ar x ../libptcblas.a);
 +	ar r $@ tmp/*.o
 +	rm -rf tmp
 +

Modified: packages/atlas/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/trunk/debian/rules?rev=36879&op=diff
==============================================================================
--- packages/atlas/trunk/debian/rules (original)
+++ packages/atlas/trunk/debian/rules Sun Sep  5 21:27:13 2010
@@ -53,29 +53,29 @@
 
 
 # # see what do we do with the amd64 / intel 64
-# ifeq ($(DEB_HOST_ARCH_CPU),amd64)
+ifeq ($(DEB_HOST_ARCH_CPU),amd64)
 # # 64 bits
-# MODE_BITWIDTH = 64
+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
-
-# ifeq ($(DEB_HOST_ARCH_CPU),ia64)
-# MODE_BITWIDTH = 64
+endif
+
+ifeq ($(DEB_HOST_ARCH_CPU),ia64)
+MODE_BITWIDTH = 64
 # ARCHS = base_25_1 sse_25_16 sse2_25_24
 # 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
-# endif
-
-# ifeq ($(DEB_HOST_ARCH_CPU),ppc64)
-# # Power PC 64
-# MODE_BITWIDTH = 64
+endif
+
+ifeq ($(DEB_HOST_ARCH_CPU),ppc64)
+# Power PC 64
+MODE_BITWIDTH = 64
 # DEB_SHLIBDEPS_INCLUDE_libatlas3gf-altivec = $(CURDIR)/debian/libatlas3gf-altivec/usr/lib/atlas-altivec:$(CURDIR)/debian/libatlas3gf-altivec/usr/lib/atlas-altivec/atlas
 # ARCHS += altivec_3_2
 # # 2 = altivec
-# endif
+endif
 
 
 # ifeq ($(DEB_HOST_ARCH_CPU),ppc)
@@ -102,7 +102,6 @@
 	--with-netlib-lapack=/usr/lib/liblapack_pic.a 	\
 	-A $$atlasArch									\
 	-V $$atlasISA 									\
-	-t 2											\
 	-v 2											\
 	-Si cputhrchk 0
 
@@ -139,7 +138,7 @@
 		# Remove all the other archs in this case
 		sed '/AFTER THAT/q' $(CURDIR)/debian/control.in > $(CURDIR)/debian/control
 		dch --local='+custom'  "custom build on: `uname -a`"
-		debian/rules ARCHS=base__ binary
+		LANG=C debian/rules ARCHS=base__ binary
 		touch $@
 
 configure-stamp:
@@ -152,13 +151,18 @@
 			fi \
 		fi
 		dh_testdir
+
 		set -e; for ext in $(ARCHS); do							\
 			targetName=`echo $$ext|sed -e "s|\(.*\)_.*_.*|atlas-\1|g"`;	\
 			atlasArch=`echo $$ext|sed -e "s|.*_\(.*\)_.*|\1|g"`;		\
 			atlasISA=`echo $$ext|sed -e "s|.*_.*_\(.*\)|\1|g"`;		\
 			mkdir -p build/$$targetName;				\
 			cd build/$$targetName;					\
-			../../configure $(COMMON_CONFIG_PARAMS);	\
+			if test "$(ARCHS)" != "base__"; then 		\
+			../../configure $(COMMON_CONFIG_PARAMS) -t 2;	\
+			else 						\
+			../../configure $(COMMON_CONFIG_PARAMS);        \
+			fi;						\
 			echo "Configure done. targetName = $$targetName / atlasArch = $$atlasArch / atlasISA = $$atlasISA";							\
 			if test ! -s Make.inc; then echo "Configure failed: Make.inc not found"; exit 1; fi; \
 			cat Make.inc |grep ARCH|head -1|awk '{print $$3}';	\

More information about the debian-science-commits mailing list