r45442 - in /packages/atlas/branches/3.10: ./ debian/ debian/patches/
sylvestre at users.alioth.debian.org
sylvestre at users.alioth.debian.org
Thu Dec 6 09:05:46 UTC 2012
Author: sylvestre
Date: Thu Dec 6 09:05:46 2012
New Revision: 45442
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45442
Log:
Initial work on the 3.10 release
Added:
packages/atlas/branches/3.10/
- copied from r45248, packages/atlas/trunk/
packages/atlas/branches/3.10/debian/changelog
- copied, changed from r45249, packages/atlas/trunk/debian/changelog
packages/atlas/branches/3.10/debian/patches/02_rename_lapack_atlas.diff
- copied, changed from r45249, packages/atlas/trunk/debian/patches/02_rename_lapack_atlas.diff
packages/atlas/branches/3.10/debian/patches/03_full_blas_lapack.diff
- copied, changed from r45249, packages/atlas/trunk/debian/patches/03_full_blas_lapack.diff
packages/atlas/branches/3.10/debian/patches/04_static_install_target.diff
- copied, changed from r45249, packages/atlas/trunk/debian/patches/04_static_install_target.diff
packages/atlas/branches/3.10/debian/patches/05_shared_full_blas.diff
- copied, changed from r45249, packages/atlas/trunk/debian/patches/05_shared_full_blas.diff
packages/atlas/branches/3.10/debian/patches/06_install_shared.diff
- copied, changed from r45249, packages/atlas/trunk/debian/patches/06_install_shared.diff
packages/atlas/branches/3.10/debian/patches/07_full_sonames.diff
- copied, changed from r45249, packages/atlas/trunk/debian/patches/07_full_sonames.diff
packages/atlas/branches/3.10/debian/patches/08_install_shared_lib_call.diff
- copied, changed from r45249, packages/atlas/trunk/debian/patches/08_install_shared_lib_call.diff
packages/atlas/branches/3.10/debian/patches/09_mkdir_inst_dir.diff
- copied, changed from r45249, packages/atlas/trunk/debian/patches/09_mkdir_inst_dir.diff
packages/atlas/branches/3.10/debian/patches/10_s390.diff
- copied, changed from r45249, packages/atlas/trunk/debian/patches/10_s390.diff
packages/atlas/branches/3.10/debian/patches/12_check-exists.diff
- copied, changed from r45249, packages/atlas/trunk/debian/patches/12_check-exists.diff
packages/atlas/branches/3.10/debian/patches/16_warning-removed.diff
- copied, changed from r45249, packages/atlas/trunk/debian/patches/16_warning-removed.diff
packages/atlas/branches/3.10/debian/patches/17_hppa.diff
- copied, changed from r45249, packages/atlas/trunk/debian/patches/17_hppa.diff
packages/atlas/branches/3.10/debian/patches/18_alpha.diff
- copied, changed from r45249, packages/atlas/trunk/debian/patches/18_alpha.diff
packages/atlas/branches/3.10/debian/patches/20_armel.diff
- copied, changed from r45249, packages/atlas/trunk/debian/patches/20_armel.diff
packages/atlas/branches/3.10/debian/patches/21_mips2.diff
- copied, changed from r45249, packages/atlas/trunk/debian/patches/21_mips2.diff
packages/atlas/branches/3.10/debian/patches/22_sh.diff
- copied, changed from r45249, packages/atlas/trunk/debian/patches/22_sh.diff
packages/atlas/branches/3.10/debian/patches/23_fix_unresolvable_on_sh4.diff
- copied unchanged from r45249, packages/atlas/trunk/debian/patches/23_fix_unresolvable_on_sh4.diff
packages/atlas/branches/3.10/debian/patches/corei1.diff
- copied unchanged from r45249, packages/atlas/trunk/debian/patches/corei1.diff
packages/atlas/branches/3.10/debian/patches/kfreebsd.diff
- copied, changed from r45249, packages/atlas/trunk/debian/patches/kfreebsd.diff
packages/atlas/branches/3.10/debian/patches/series
- copied, changed from r45249, packages/atlas/trunk/debian/patches/series
packages/atlas/branches/3.10/debian/rules
- copied, changed from r45249, packages/atlas/trunk/debian/rules
Modified:
packages/atlas/branches/3.10/debian/orig-tar.sh
Copied: packages/atlas/branches/3.10/debian/changelog (from r45249, packages/atlas/trunk/debian/changelog)
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/branches/3.10/debian/changelog?rev=45442&op=diff
==============================================================================
--- packages/atlas/trunk/debian/changelog (original)
+++ packages/atlas/branches/3.10/debian/changelog Thu Dec 6 09:05:46 2012
@@ -1,15 +1,16 @@
+atlas (3.10.0-1~exp1) experimental; urgency=low
+
+ * New upstream release
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Mon, 16 Jul 2012 14:57:17 +0200
+
atlas (3.8.4-9) UNRELEASED; urgency=low
- [ Sébastien Villemot ]
* libatlas-test: put in devel/extra, to reflect override
* Force generic PPC CPU when building a non-custom package on a PPC arch
(Closes: #680096)
- [ Sylvestre Ledru ]
- * Use series for list the patches
- * Patches refreshed
-
- -- Sylvestre Ledru <sylvestre at debian.org> Mon, 16 Jul 2012 15:28:50 +0200
+ -- Sébastien Villemot <sebastien.villemot at ens.fr> Fri, 29 Jun 2012 19:13:39 +0000
atlas (3.8.4-8) unstable; urgency=low
Modified: packages/atlas/branches/3.10/debian/orig-tar.sh
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/branches/3.10/debian/orig-tar.sh?rev=45442&op=diff
==============================================================================
--- packages/atlas/branches/3.10/debian/orig-tar.sh (original)
+++ packages/atlas/branches/3.10/debian/orig-tar.sh Thu Dec 6 09:05:46 2012
@@ -3,17 +3,17 @@
# called by uscan with '--upstream-version' <version> <file>
DIR=ATLAS
DIRTARGET=atlas-$2
-TAR=../atlas_$2.orig.tar.gz
+TAR=../atlas_$2.orig.tar.bz2
# clean up the upstream tarball
-tar zxvf $3
+tar jxvf $3
mv $DIR $DIRTARGET
# Before
# cvs -d:pserver:anonymous at math-atlas.cvs.sourceforge.net:/cvsroot/math-atlas login
cvs -z3 -d:pserver:anonymous at math-atlas.cvs.sourceforge.net:/cvsroot/math-atlas co -P AtlasBase
mv AtlasBase/TexDoc/ $DIRTARGET
rm -rf AtlasBase
-tar -c -z -f $TAR -X debian/orig-tar.exclude $DIRTARGET
+tar -j -c -f $TAR -X debian/orig-tar.exclude $DIRTARGET
rm -rf $DIRTARGET
# move to directory 'tarballs'
Copied: packages/atlas/branches/3.10/debian/patches/02_rename_lapack_atlas.diff (from r45249, packages/atlas/trunk/debian/patches/02_rename_lapack_atlas.diff)
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/branches/3.10/debian/patches/02_rename_lapack_atlas.diff?rev=45442&op=diff
==============================================================================
--- packages/atlas/trunk/debian/patches/02_rename_lapack_atlas.diff (original)
+++ packages/atlas/branches/3.10/debian/patches/02_rename_lapack_atlas.diff Thu Dec 6 09:05:46 2012
@@ -5,24 +5,24 @@
## DP: Rename ATLAS incomplete lapack to lapack_atlas.
@DPATCH@
-Index: ATLAS/CONFIG/src/SpewMakeInc.c
+Index: atlas-3.10.0/CONFIG/src/SpewMakeInc.c
===================================================================
---- ATLAS.orig/CONFIG/src/SpewMakeInc.c 2011-05-14 19:33:24.000000000 +0200
-+++ ATLAS/CONFIG/src/SpewMakeInc.c 2012-07-16 15:34:02.000000000 +0200
-@@ -536,7 +536,7 @@
- fprintf(fpout, " PTCBLASlib = $(LIBdir)/libptcblas.a\n");
- fprintf(fpout, " PTF77BLASlib = $(LIBdir)/libptf77blas.a\n");
- }
+--- atlas-3.10.0.orig/CONFIG/src/SpewMakeInc.c 2012-07-10 21:22:50.000000000 +0200
++++ atlas-3.10.0/CONFIG/src/SpewMakeInc.c 2012-07-16 16:08:50.000000000 +0200
+@@ -595,7 +595,7 @@
+ fprintf(fpout, " ATLASlib = $(LIBdir)/libatlas.a\n");
+ fprintf(fpout, " CBLASlib = $(LIBdir)/libcblas.a\n");
+ fprintf(fpout, " F77BLASlib = $(LIBdir)/libf77blas.a\n");
- fprintf(fpout, " LAPACKlib = $(LIBdir)/liblapack.a\n");
+ fprintf(fpout, " LAPACKlib = $(LIBdir)/liblapack_atlas.a\n");
- fprintf(fpout, " TESTlib = $(LIBdir)/libtstatlas.a\n\n");
-
- fprintf(fpout, "# -------------------------------------------\n");
-Index: ATLAS/Make.top
+ if (THREADS)
+ {
+ fprintf(fpout, " PTCBLASlib = $(LIBdir)/libptcblas.a\n");
+Index: atlas-3.10.0/Make.top
===================================================================
---- ATLAS.orig/Make.top 2011-05-14 19:33:23.000000000 +0200
-+++ ATLAS/Make.top 2012-07-16 15:34:02.000000000 +0200
-@@ -291,8 +291,8 @@
+--- atlas-3.10.0.orig/Make.top 2012-07-10 21:22:50.000000000 +0200
++++ atlas-3.10.0/Make.top 2012-07-16 16:08:05.000000000 +0200
+@@ -657,8 +657,8 @@
install_lib:
cp $(LIBdir)/libatlas.a $(INSTdir)/.
cp $(LIBdir)/libcblas.a $(INSTdir)/.
@@ -33,11 +33,11 @@
$(INSTdir)/libcblas.a
- cp $(LIBdir)/libf77blas.a $(INSTdir)/.
- chmod 0644 $(INSTdir)/libf77blas.a
-Index: ATLAS/makes/Make.lib
+Index: atlas-3.10.0/makes/Make.lib
===================================================================
---- ATLAS.orig/makes/Make.lib 2011-05-14 19:33:24.000000000 +0200
-+++ ATLAS/makes/Make.lib 2012-07-16 15:34:02.000000000 +0200
-@@ -3,10 +3,10 @@
+--- atlas-3.10.0.orig/makes/Make.lib 2012-07-10 21:22:50.000000000 +0200
++++ atlas-3.10.0/makes/Make.lib 2012-07-16 16:10:29.000000000 +0200
+@@ -4,10 +4,10 @@
#
# override with libatlas.so only when atlas is built to one lib
#
@@ -50,9 +50,9 @@
+CDYNlibs = liblapack_atlas.so libcblas.so libatlas.so
+CPTDYNlibs = liblapack_atlas.so libptcblas.so libatlas.so
- VER=3.8.4
- tarnam = atlas$(VER)_$(ARCH)
-@@ -23,7 +23,7 @@
+ VER=3.10.0
+ tmpd = RCW_tMp
+@@ -26,7 +26,7 @@
cp $(LIBdir)/libatlas.a $(ARCH)/lib/.
cp $(LIBdir)/libf77blas.a $(ARCH)/lib/.
cp $(LIBdir)/libcblas.a $(ARCH)/lib/.
@@ -61,87 +61,55 @@
- cp $(LIBdir)/libptcblas.a $(ARCH)/lib/.
- cp $(LIBdir)/libptf77blas.a $(ARCH)/lib/.
$(TAR) cf $(tarnam).tar $(ARCH)
-@@ -32,28 +32,28 @@
- mv $(tarnam).tar.gz $(tarnam).tgz
-
- ptshared :
-- - rm -f libatlas.so liblapack.so
-- $(MAKE) libatlas.so liblapack.so libptf77blas.so libf77blas.so \
-- libptcblas.so libcblas.so liblapack.so
-+ - rm -f libatlas.so liblapack_atlas.so
-+ $(MAKE) libatlas.so liblapack_atlas.so libptf77blas.so libf77blas.so \
-+ libptcblas.so libcblas.so liblapack_atlas.so
- shared :
-- - rm -f libatlas.so liblapack.so
-- $(MAKE) libatlas.so liblapack.so libf77blas.so libcblas.so liblapack.so
-+ - rm -f libatlas.so liblapack_atlas.so
-+ $(MAKE) libatlas.so liblapack_atlas.so libf77blas.so libcblas.so liblapack_atlas.so
- cptshared :
-- - rm -f libatlas.so libclapack.so
-- $(MAKE) libatlas.so libclapack.so libptcblas.so libcblas.so
-+ - rm -f libatlas.so libclapack_atlas.so
-+ $(MAKE) libatlas.so libclapack_atlas.so libptcblas.so libcblas.so
- cshared :
-- - rm -f libatlas.so libclapack.so
-- $(MAKE) libatlas.so libclapack.so libcblas.so
-+ - rm -f libatlas.so libclapack_atlas.so
-+ $(MAKE) libatlas.so libclapack_atlas.so libcblas.so
-
- libatlas.so : libatlas.a
- ld $(LDFLAGS) -shared -soname libatlas.so -o libatlas.so \
- --whole-archive libatlas.a --no-whole-archive -lc $(LIBS)
--liblapack.so : liblapack.a
-+liblapack_atlas.so : liblapack_atlas.a
- ld $(LDFLAGS) -shared -soname $@ -o $@ --whole-archive \
-- liblapack.a --no-whole-archive $(F77SYSLIB)
--libclapack.so : libclapack.a
-- ld $(LDFLAGS) -shared -soname liblapack.so -o liblapack.so \
-- --whole-archive libclapack.a
-+ liblapack_atlas.a --no-whole-archive $(F77SYSLIB)
-+libclapack_atlas.so : libclapack_atlas.a
-+ ld $(LDFLAGS) -shared -soname liblapack_atlas.so -o liblapack_atlas.so \
-+ --whole-archive libclapack_atlas.a
- libptf77blas.so : libptf77blas.a
- ld $(LDFLAGS) -shared -soname $@ -o $@ --whole-archive libptf77blas.a \
- --no-whole-archive $(F77SYSLIB)
-@@ -69,30 +69,30 @@
- #
- fat_ptshared : # threaded target
- ld $(LDFLAGS) -shared -soname libatlas.so -o libatlas.so \
-- --whole-archive liblapack.a libptf77blas.a libptcblas.a libatlas.a \
-+ --whole-archive liblapack_atlas.a libptf77blas.a libptcblas.a libatlas.a \
- --no-whole-archive -lc $(F77SYSLIB) $(LIBS)
- fat_shared : # unthreaded target
- ld $(LDFLAGS) -shared -soname libatlas.so -o libatlas.so \
-- --whole-archive liblapack.a libf77blas.a libcblas.a libatlas.a \
-+ --whole-archive liblapack_atlas.a libf77blas.a libcblas.a libatlas.a \
- --no-whole-archive -lc $(F77SYSLIB) $(LIBS)
+@@ -184,7 +184,7 @@
+ LIBINSTdir="$(LIBINSTdir)"
+ fat_shared : # serial target
+ $(MAKE) TRYALL outso=libsatlas.so \
+- libas="liblapack.a libf77blas.a libcblas.a libatlas.a" \
++ libas="liblapack_atlas.a libf77blas.a libcblas.a libatlas.a" \
+ LIBINSTdir="$(LIBINSTdir)"
#
# Builds shared lib, not include fortran codes from LAPACK
- #
--fat_cptshared : libclapack.a # threaded target
-+fat_cptshared : libclapack_atlas.a # threaded target
- ld $(LDFLAGS) -shared -soname libcatlas.so -o libcatlas.so \
-- --whole-archive libclapack.a libptcblas.a libatlas.a \
-+ --whole-archive libclapack_atlas.a libptcblas.a libatlas.a \
- --no-whole-archive -lc $(LIBS)
--fat_cshared : libclapack.a # unthreaded target
-+fat_cshared : libclapack_atlas.a # unthreaded target
- ld $(LDFLAGS) -shared -soname libcatlas.so -o libcatlas.so \
-- --whole-archive libclapack.a libcblas.a libatlas.a \
-+ --whole-archive libclapack_atlas.a libcblas.a libatlas.a \
- --no-whole-archive -lc $(LIBS)
+@@ -198,10 +198,10 @@
+ libas="libclapack.a libcblas.a libatlas.a" \
+ LIBINSTdir="$(LIBINSTdir)"
-libclapack.a : liblapack.a
-- rm -rf clapack libclapack.a
-+libclapack_atlas.a : liblapack_atlas.a
-+ rm -rf clapack libclapack_atlas.a
++libclapack.a : liblapack_atlas.a
+ rm -rf clapack libclapack.a
mkdir clapack
- cd clapack ; ar x ../liblapack.a
+ cd clapack ; ar x ../liblapack_atlas.a
- rm -f clapack/*f77wrap*
-- ar r libclapack.a clapack/ATL_* clapack/clapack_*
-+ ar r libclapack_atlas.a clapack/ATL_* clapack/clapack_*
+ rm -f clapack/*f77wrap* clapack/*C2F*
+ ar r libclapack.a clapack/ATL_* clapack/clapack_*
rm -rf clapack
- xtst_lp: $(DYNlibs)
- $(ICC) $(CDEFS) -o $@ $(mySRCdir)/qr.c $(DYNlibs) -Wl,--rpath ./
+@@ -229,7 +229,7 @@
+ LIBINSTdir="$(LIBINSTdir)"
+ sdlls: # serial target
+ $(MAKE) TRYALL_WIN outso=libsatlas.dll outdef=libsatlas.def \
+- libas="liblapack.a libf77blas.a libcblas.a libatlas.a" \
++ libas="liblapack_atlas.a libf77blas.a libcblas.a libatlas.a" \
+ LIBINSTdir="$(LIBINSTdir)"
+ cdlls: ctdlls csdlls
+ ctdlls: libptclapack.a # threaded target
+@@ -246,7 +246,7 @@
+ # =======================================================================
+ dylib :
+ rm -rf $(tmpd) ; mkdir $(tmpd)
+- cd $(tmpd) ; ar x ../liblapack.a
++ cd $(tmpd) ; ar x ../liblapack_atlas.a
+ cd $(tmpd) ; ar x ../libf77blas.a
+ cd $(tmpd) ; ar x ../libcblas.a
+ cd $(tmpd) ; ar x ../libatlas.a
+@@ -283,9 +283,9 @@
+ -compatibility_version $(VER) *.o $(LIBS)
+ rm -rf $(tmpd)
+
+-libclapack.dylib : libcblas.dylib libatlas.dylib liblapack.a
++libclapack.dylib : libcblas.dylib libatlas.dylib liblapack_atlas.a
+ rm -rf $(tmpd) ; mkdir $(tmpd)
+- cd $(tmpd) ; ar x ../liblapack.a
++ cd $(tmpd) ; ar x ../liblapack_atlas.a
+ rm -f $(tmpd)/*C2F $(tmpd)/*f77wrap*
+ cd $(tmpd) ; libtool -dynamic -o ../libclapack.dylib \
+ -install_name $(LIBINSTdir)/libclapack.dylib \
Copied: packages/atlas/branches/3.10/debian/patches/03_full_blas_lapack.diff (from r45249, packages/atlas/trunk/debian/patches/03_full_blas_lapack.diff)
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/branches/3.10/debian/patches/03_full_blas_lapack.diff?rev=45442&op=diff
==============================================================================
--- packages/atlas/trunk/debian/patches/03_full_blas_lapack.diff (original)
+++ packages/atlas/branches/3.10/debian/patches/03_full_blas_lapack.diff Thu Dec 6 09:05:46 2012
@@ -6,34 +6,34 @@
@DPATCH@
-Index: ATLAS/Make.top
+Index: atlas-3.10.0/Make.top
===================================================================
---- ATLAS.orig/Make.top 2012-07-16 15:34:02.000000000 +0200
-+++ ATLAS/Make.top 2012-07-16 15:34:07.000000000 +0200
-@@ -115,6 +115,7 @@
+--- atlas-3.10.0.orig/Make.top 2012-07-16 16:08:05.000000000 +0200
++++ atlas-3.10.0/Make.top 2012-07-16 16:10:51.000000000 +0200
+@@ -401,6 +401,7 @@
$(MAKE) -f Make.top leafstart leaf=src/blas/reference/level1
$(MAKE) -f Make.top leafstart leaf=src/auxil
$(MAKE) -f Make.top leafstart leaf=src/testing
+ $(MAKE) -f Make.top leafstart leaf=lib/atlas
$(MAKE) -f Make.top leafstart leaf=lib
$(MAKE) -f Make.top leafstart leaf=bin
- cd src/blas/gemm ; mkdir KERNEL
-@@ -271,6 +272,7 @@
+ cd src/threads ; touch atomic.inc
+@@ -591,6 +592,7 @@
lib :
mkdir lib
+ mkdir lib/atlas
- include/:
+ include:
mkdir include
-Index: ATLAS/makes/Make.lib
+Index: atlas-3.10.0/makes/Make.lib
===================================================================
---- ATLAS.orig/makes/Make.lib 2012-07-16 15:34:02.000000000 +0200
-+++ ATLAS/makes/Make.lib 2012-07-16 15:34:07.000000000 +0200
-@@ -64,6 +64,24 @@
- ld $(LDFLAGS) -shared -soname $@ -o $@ --whole-archive libptcblas.a
- libcblas.so : libcblas.a
- ld $(LDFLAGS) -shared -soname $@ -o $@ --whole-archive libcblas.a
+--- atlas-3.10.0.orig/makes/Make.lib 2012-07-16 16:10:29.000000000 +0200
++++ atlas-3.10.0/makes/Make.lib 2012-07-16 16:11:29.000000000 +0200
+@@ -175,6 +175,25 @@
+ LIBS="$(LIBS)" LIBINSTdir="$(LIBINSTdir)" ; \
+ fi
+
+
+# Build full netlib blas/lapack libraries:
+atlas/libblas.a: libatlas.a libptf77blas.a libptcblas.a
@@ -52,6 +52,7 @@
+ ar r $@ tmp/*.o
+ rm -rf tmp
+
++
#
# Builds one shared lib from all ATLAS files
#
Copied: packages/atlas/branches/3.10/debian/patches/04_static_install_target.diff (from r45249, packages/atlas/trunk/debian/patches/04_static_install_target.diff)
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/branches/3.10/debian/patches/04_static_install_target.diff?rev=45442&op=diff
==============================================================================
--- packages/atlas/trunk/debian/patches/04_static_install_target.diff (original)
+++ packages/atlas/branches/3.10/debian/patches/04_static_install_target.diff Thu Dec 6 09:05:46 2012
@@ -5,25 +5,25 @@
## DP: No description.
@DPATCH@
-Index: ATLAS/CONFIG/src/Makefile
+Index: atlas-3.10.0/CONFIG/src/Makefile
===================================================================
---- ATLAS.orig/CONFIG/src/Makefile 2011-05-14 19:33:24.000000000 +0200
-+++ ATLAS/CONFIG/src/Makefile 2012-07-16 15:34:10.000000000 +0200
-@@ -366,7 +366,7 @@
+--- atlas-3.10.0.orig/CONFIG/src/Makefile 2012-07-10 21:22:50.000000000 +0200
++++ atlas-3.10.0/CONFIG/src/Makefile 2012-07-16 16:11:36.000000000 +0200
+@@ -575,7 +575,7 @@
chmod 0755 $(LIBINSTdir)
install : $(INCINSTdir) $(LIBINSTdir) $(INCINSTdir)/atlas
$(MAKE) -f Make.top install_inc INSTdir=$(INCINSTdir)
- $(MAKE) -f Make.top install_lib INSTdir=$(LIBINSTdir)
+ $(MAKE) -f Make.top install_static_lib INSTdir=$(LIBINSTdir)
- confclean:
+ confclean: $(CLEANdep)
rm -f *core* *.o config?.out
-Index: ATLAS/CONFIG/src/SpewMakeInc.c
+Index: atlas-3.10.0/CONFIG/src/SpewMakeInc.c
===================================================================
---- ATLAS.orig/CONFIG/src/SpewMakeInc.c 2012-07-16 15:34:02.000000000 +0200
-+++ ATLAS/CONFIG/src/SpewMakeInc.c 2012-07-16 15:34:10.000000000 +0200
-@@ -539,6 +539,9 @@
- fprintf(fpout, " LAPACKlib = $(LIBdir)/liblapack_atlas.a\n");
+--- atlas-3.10.0.orig/CONFIG/src/SpewMakeInc.c 2012-07-16 16:08:50.000000000 +0200
++++ atlas-3.10.0/CONFIG/src/SpewMakeInc.c 2012-07-16 16:11:36.000000000 +0200
+@@ -604,6 +604,9 @@
+ }
fprintf(fpout, " TESTlib = $(LIBdir)/libtstatlas.a\n\n");
+ fprintf(fpout, " FULLBLASlib = $(LIBdir)/atlas/libblas.a\n");
@@ -32,11 +32,11 @@
fprintf(fpout, "# -------------------------------------------\n");
fprintf(fpout, "# Upper bound on largest cache size, in bytes\n");
fprintf(fpout, "# -------------------------------------------\n");
-Index: ATLAS/Make.top
+Index: atlas-3.10.0/Make.top
===================================================================
---- ATLAS.orig/Make.top 2012-07-16 15:34:07.000000000 +0200
-+++ ATLAS/Make.top 2012-07-16 15:34:10.000000000 +0200
-@@ -15,6 +15,11 @@
+--- atlas-3.10.0.orig/Make.top 2012-07-16 16:10:51.000000000 +0200
++++ atlas-3.10.0/Make.top 2012-07-16 16:11:36.000000000 +0200
+@@ -14,6 +14,11 @@
build:
cd bin/ ; $(MAKE) xatlas_build
cd bin/ ; ./xatlas_build $(INSTFLAGS)
@@ -48,7 +48,7 @@
time:
./xatlbench -dc $(BLDdir)/bin/INSTALL_LOG -dp $(BLDdir)/ARCHS/$(ARCH)
C_sanity_test:
-@@ -290,12 +295,16 @@
+@@ -656,12 +661,16 @@
chmod 0644 $(INSTdir)/cblas.h $(INSTdir)/clapack.h
cp $(INCAdir)/* $(INSTdir)/atlas/.
- chmod 0644 $(INSTdir)/atlas/*
Copied: packages/atlas/branches/3.10/debian/patches/05_shared_full_blas.diff (from r45249, packages/atlas/trunk/debian/patches/05_shared_full_blas.diff)
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/branches/3.10/debian/patches/05_shared_full_blas.diff?rev=45442&op=diff
==============================================================================
--- packages/atlas/trunk/debian/patches/05_shared_full_blas.diff (original)
+++ packages/atlas/branches/3.10/debian/patches/05_shared_full_blas.diff Thu Dec 6 09:05:46 2012
@@ -5,13 +5,13 @@
## DP: No description.
@DPATCH@
-Index: ATLAS/makes/Make.lib
+Index: atlas-3.10.0/makes/Make.lib
===================================================================
---- ATLAS.orig/makes/Make.lib 2012-07-16 15:34:07.000000000 +0200
-+++ ATLAS/makes/Make.lib 2012-07-16 15:34:14.000000000 +0200
-@@ -82,6 +82,15 @@
- ar r $@ tmp/*.o
- rm -rf tmp
+--- atlas-3.10.0.orig/makes/Make.lib 2012-07-16 16:11:29.000000000 +0200
++++ atlas-3.10.0/makes/Make.lib 2012-07-16 16:11:40.000000000 +0200
+@@ -42,6 +42,15 @@
+ cptshared : fat_cptshared
+ cshared : fat_cshared
+atlas/libblas.so: atlas/libblas.a libatlas.so
+ ld $(LDFLAGS) -shared -soname libblas.so -o $@ \
@@ -23,5 +23,5 @@
+ --whole-archive atlas/liblapack.a \
+ --no-whole-archive -L . -lblas $(F77SYSLIB) -lm -lc
#
- # Builds one shared lib from all ATLAS files
+ # These are a bunch of different ways to attempt to build a .so, try them all
#
Copied: packages/atlas/branches/3.10/debian/patches/06_install_shared.diff (from r45249, packages/atlas/trunk/debian/patches/06_install_shared.diff)
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/branches/3.10/debian/patches/06_install_shared.diff?rev=45442&op=diff
==============================================================================
--- packages/atlas/trunk/debian/patches/06_install_shared.diff (original)
+++ packages/atlas/branches/3.10/debian/patches/06_install_shared.diff Thu Dec 6 09:05:46 2012
@@ -5,13 +5,13 @@
## DP: No description.
@DPATCH@
-Index: ATLAS/Make.top
+Index: atlas-3.10.0/Make.top
===================================================================
---- ATLAS.orig/Make.top 2012-07-16 15:34:10.000000000 +0200
-+++ ATLAS/Make.top 2012-07-16 15:34:17.000000000 +0200
-@@ -311,3 +311,12 @@
- - cp $(LIBdir)/libptf77blas.a $(INSTdir)/.
- - chmod 0644 $(INSTdir)/libptcblas.a $(INSTdir)/libptf77blas.a
+--- atlas-3.10.0.orig/Make.top 2012-07-16 16:11:36.000000000 +0200
++++ atlas-3.10.0/Make.top 2012-07-16 16:14:33.000000000 +0200
+@@ -684,3 +684,12 @@
+ - cp $(LIBdir)/libsatlas.so $(INSTdir)/.
+ - cp $(LIBdir)/libtatlas.so $(INSTdir)/.
+install_shared_lib:
+ for lib in atlas cblas f77blas lapack_atlas; do \
@@ -22,55 +22,3 @@
+ cp $(LIBdir)/atlas/lib$$lib.so $(INSTdir)/atlas/. ; \
+ chmod 0644 $(INSTdir)/atlas/lib$$lib.so ;\
+ done;
-Index: ATLAS/makes/Make.lib
-===================================================================
---- ATLAS.orig/makes/Make.lib 2012-07-16 15:34:14.000000000 +0200
-+++ ATLAS/makes/Make.lib 2012-07-16 15:34:17.000000000 +0200
-@@ -36,8 +36,11 @@
- $(MAKE) libatlas.so liblapack_atlas.so libptf77blas.so libf77blas.so \
- libptcblas.so libcblas.so liblapack_atlas.so
- shared :
-- - rm -f libatlas.so liblapack_atlas.so
-+ - rm -f libatlas.so liblapack_atlas.so libf77blas.so libcblas.so liblapack_atlas.so
- $(MAKE) libatlas.so liblapack_atlas.so libf77blas.so libcblas.so liblapack_atlas.so
-+fullshared :
-+ - rm -f atlas/libblas.so atlas/liblapack.so
-+ $(MAKE) atlas/libblas.so atlas/liblapack.so
- cptshared :
- - rm -f libatlas.so libclapack_atlas.so
- $(MAKE) libatlas.so libclapack_atlas.so libptcblas.so libcblas.so
-@@ -48,22 +51,26 @@
- libatlas.so : libatlas.a
- ld $(LDFLAGS) -shared -soname libatlas.so -o libatlas.so \
- --whole-archive libatlas.a --no-whole-archive -lc $(LIBS)
--liblapack_atlas.so : liblapack_atlas.a
-- ld $(LDFLAGS) -shared -soname $@ -o $@ --whole-archive \
-- liblapack_atlas.a --no-whole-archive $(F77SYSLIB)
-+liblapack_atlas.so : liblapack_atlas.a libatlas.so libcblas.so libf77blas.so
-+ ld $(LDFLAGS) -shared -soname $@ -o $@ \
-+ --whole-archive liblapack_atlas.a \
-+ --no-whole-archive -L. -lf77blas -lcblas -latlas -lm -c $(F77SYSLIB)
- libclapack_atlas.so : libclapack_atlas.a
- ld $(LDFLAGS) -shared -soname liblapack_atlas.so -o liblapack_atlas.so \
- --whole-archive libclapack_atlas.a
- libptf77blas.so : libptf77blas.a
- ld $(LDFLAGS) -shared -soname $@ -o $@ --whole-archive libptf77blas.a \
- --no-whole-archive $(F77SYSLIB)
--libf77blas.so : libf77blas.a
-- ld $(LDFLAGS) -shared -soname $@ -o $@ --whole-archive libf77blas.a \
-- --no-whole-archive $(F77SYSLIB)
-+libf77blas.so : libf77blas.a libcblas.so libatlas.so
-+ ld $(LDFLAGS) -shared -soname $@ -o $@ \
-+ --whole-archive libf77blas.a \
-+ --no-whole-archive -L. -lcblas -latlas $(F77SYSLIB) -lm -lc
- libptcblas.so : libptcblas.a
- ld $(LDFLAGS) -shared -soname $@ -o $@ --whole-archive libptcblas.a
--libcblas.so : libcblas.a
-- ld $(LDFLAGS) -shared -soname $@ -o $@ --whole-archive libcblas.a
-+libcblas.so : libcblas.a libatlas.so
-+ ld $(LDFLAGS) -shared -soname $@ -o $@ \
-+ --whole-archive libcblas.a \
-+ --no-whole-archive -L. -latlas $(F77SYSLIB) -lm -lc
-
- # Build full netlib blas/lapack libraries:
- atlas/libblas.a: libatlas.a libptf77blas.a libptcblas.a
Copied: packages/atlas/branches/3.10/debian/patches/07_full_sonames.diff (from r45249, packages/atlas/trunk/debian/patches/07_full_sonames.diff)
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/branches/3.10/debian/patches/07_full_sonames.diff?rev=45442&op=diff
==============================================================================
--- packages/atlas/trunk/debian/patches/07_full_sonames.diff (original)
+++ packages/atlas/branches/3.10/debian/patches/07_full_sonames.diff Thu Dec 6 09:05:46 2012
@@ -5,11 +5,11 @@
## DP: No description.
@DPATCH@
-Index: ATLAS/CONFIG/src/Makefile
+Index: atlas-3.10.0/CONFIG/src/Makefile
===================================================================
---- ATLAS.orig/CONFIG/src/Makefile 2012-07-16 15:34:10.000000000 +0200
-+++ ATLAS/CONFIG/src/Makefile 2012-07-16 15:34:19.000000000 +0200
-@@ -367,6 +367,13 @@
+--- atlas-3.10.0.orig/CONFIG/src/Makefile 2012-07-16 16:11:36.000000000 +0200
++++ atlas-3.10.0/CONFIG/src/Makefile 2012-07-16 16:17:24.000000000 +0200
+@@ -576,6 +576,13 @@
install : $(INCINSTdir) $(LIBINSTdir) $(INCINSTdir)/atlas
$(MAKE) -f Make.top install_inc INSTdir=$(INCINSTdir)
$(MAKE) -f Make.top install_static_lib INSTdir=$(LIBINSTdir)
@@ -21,13 +21,13 @@
+ $(MAKE) -f Make.top install_shared_lib INSTdir=$(LIBINSTdir)
+
- confclean:
+ confclean: $(CLEANdep)
rm -f *core* *.o config?.out
-Index: ATLAS/Make.top
+Index: atlas-3.10.0/Make.top
===================================================================
---- ATLAS.orig/Make.top 2012-07-16 15:34:17.000000000 +0200
-+++ ATLAS/Make.top 2012-07-16 15:34:19.000000000 +0200
-@@ -289,6 +289,7 @@
+--- atlas-3.10.0.orig/Make.top 2012-07-16 16:14:33.000000000 +0200
++++ atlas-3.10.0/Make.top 2012-07-16 16:17:24.000000000 +0200
+@@ -655,6 +655,7 @@
touch include/dXover.h
touch include/sXover.h
@@ -35,7 +35,7 @@
install_inc:
cp $(INCSdir)/cblas.h $(INSTdir)/.
cp $(INCSdir)/clapack.h $(INSTdir)/.
-@@ -313,10 +314,18 @@
+@@ -686,10 +687,18 @@
install_shared_lib:
for lib in atlas cblas f77blas lapack_atlas; do \
@@ -56,12 +56,12 @@
+ chmod 0644 $(INSTdir)/atlas/lib$$lib.so.3 ;\
+ chmod 0644 $(INSTdir)/atlas/lib$$lib.so.3.0 ;\
done;
-Index: ATLAS/makes/Make.lib
+Index: atlas-3.10.0/makes/Make.lib
===================================================================
---- ATLAS.orig/makes/Make.lib 2012-07-16 15:34:17.000000000 +0200
-+++ ATLAS/makes/Make.lib 2012-07-16 15:34:19.000000000 +0200
-@@ -1,12 +1,12 @@
- include Make.inc
+--- atlas-3.10.0.orig/makes/Make.lib 2012-07-16 16:11:40.000000000 +0200
++++ atlas-3.10.0/makes/Make.lib 2012-07-16 16:19:20.000000000 +0200
+@@ -2,12 +2,12 @@
+ LD = ld
mySRCdir = $(SRCdir)/lib
#
-# override with libatlas.so only when atlas is built to one lib
@@ -76,12 +76,13 @@
+CDYNlibs = liblapack_atlas.so.3.0 libcblas.so.3.0 libatlas.so.3.0
+CPTDYNlibs = liblapack_atlas.so.3.0 libptcblas.so.3.0 libatlas.so.3.0
- VER=3.8.4
- tarnam = atlas$(VER)_$(ARCH)
-@@ -31,44 +31,95 @@
- $(GZIP) --best $(tarnam).tar
- mv $(tarnam).tar.gz $(tarnam).tgz
+ VER=3.10.0
+ tmpd = RCW_tMp
+@@ -33,6 +33,59 @@
+ rm -rf $(ARCH)
+ $(BZIP) --best $(tarnam).tar
++
+# Soft link creation
+# XXX: I cannot make default rule work for some reason...
+libatlas.so: libatlas.so.3
@@ -132,127 +133,61 @@
+ rm -f $@
+ (cd atlas && ln -s liblapack.so.3.0 liblapack.so.3)
+
-+# Build rules
- ptshared :
-- - rm -f libatlas.so liblapack_atlas.so
-- $(MAKE) libatlas.so liblapack_atlas.so libptf77blas.so libf77blas.so \
-- libptcblas.so libcblas.so liblapack_atlas.so
-+ - rm -f libatlas.so.3.0 liblapack_atlas.so.3.0
-+ $(MAKE) libatlas.so.3.0 liblapack_atlas.so.3.0 libptf77blas.so.3.0 libf77blas.so.3.0 \
-+ libptcblas.so.3.0 libcblas.so.3.0 liblapack_atlas.so.3.0
- shared :
-- - rm -f libatlas.so liblapack_atlas.so libf77blas.so libcblas.so liblapack_atlas.so
-- $(MAKE) libatlas.so liblapack_atlas.so libf77blas.so libcblas.so liblapack_atlas.so
-+ - rm -f libatlas.so.3.0 liblapack_atlas.so.3.0 libf77blas.so.3.0 libcblas.so.3.0 liblapack_atlas.so.3.0
-+ $(MAKE) libatlas.so.3.0 liblapack_atlas.so.3.0 libf77blas.so.3.0 libcblas.so.3.0 liblapack_atlas.so.3.0
- fullshared :
-- - rm -f atlas/libblas.so atlas/liblapack.so
-- $(MAKE) atlas/libblas.so atlas/liblapack.so
-+ - rm -f atlas/libblas.so.3.0 atlas/liblapack.so.3.0
-+ $(MAKE) atlas/libblas.so.3.0 atlas/liblapack.so.3.0
- cptshared :
-- - rm -f libatlas.so libclapack_atlas.so
-- $(MAKE) libatlas.so libclapack_atlas.so libptcblas.so libcblas.so
-+ - rm -f libatlas.so.3.0 libclapack_atlas.so.3.0
-+ $(MAKE) libatlas.so.3.0 libclapack_atlas.so.3.0 libptcblas.so.3.0 libcblas.so.3.0
- cshared :
-- - rm -f libatlas.so libclapack_atlas.so
-- $(MAKE) libatlas.so libclapack_atlas.so libcblas.so
-+ - rm -f libatlas.so.3.0 libclapack_atlas.so.3.0
-+ $(MAKE) libatlas.so.3.0 libclapack_atlas.so.3.0 libcblas.so.3.0
-
--libatlas.so : libatlas.a
-- ld $(LDFLAGS) -shared -soname libatlas.so -o libatlas.so \
-+libatlas.so.3.0 : libatlas.a
-+ ld $(LDFLAGS) -shared -soname libatlas.so.3 -o $@ \
- --whole-archive libatlas.a --no-whole-archive -lc $(LIBS)
--liblapack_atlas.so : liblapack_atlas.a libatlas.so libcblas.so libf77blas.so
-- ld $(LDFLAGS) -shared -soname $@ -o $@ \
-+liblapack_atlas.so.3.0 : liblapack_atlas.a libatlas.so libcblas.so libf77blas.so
-+ ld $(LDFLAGS) -shared -soname liblapack_atlas.so.3 -o $@ \
- --whole-archive liblapack_atlas.a \
-- --no-whole-archive -L. -lf77blas -lcblas -latlas -lm -c $(F77SYSLIB)
--libclapack_atlas.so : libclapack_atlas.a
-- ld $(LDFLAGS) -shared -soname liblapack_atlas.so -o liblapack_atlas.so \
-+ --no-whole-archive -L. -lf77blas -lcblas -latlas -lm -lc $(F77SYSLIB)
-+libclapack_atlas.so.3.0 : libclapack_atlas.a
-+ ld $(LDFLAGS) -shared -soname liblapack_atlas.so.3.0 -o liblapack_atlas.so.3.0 \
- --whole-archive libclapack_atlas.a
--libptf77blas.so : libptf77blas.a
-+libptf77blas.so.3.0 : libptf77blas.a
- ld $(LDFLAGS) -shared -soname $@ -o $@ --whole-archive libptf77blas.a \
- --no-whole-archive $(F77SYSLIB)
--libf77blas.so : libf77blas.a libcblas.so libatlas.so
-- ld $(LDFLAGS) -shared -soname $@ -o $@ \
-+libf77blas.so.3.0 : libf77blas.a libcblas.so libatlas.so
-+ ld $(LDFLAGS) -shared -soname libf77blas.so.3 -o $@ \
- --whole-archive libf77blas.a \
- --no-whole-archive -L. -lcblas -latlas $(F77SYSLIB) -lm -lc
--libptcblas.so : libptcblas.a
-+libptcblas.so.3.0 : libptcblas.a
- ld $(LDFLAGS) -shared -soname $@ -o $@ --whole-archive libptcblas.a
--libcblas.so : libcblas.a libatlas.so
-- ld $(LDFLAGS) -shared -soname $@ -o $@ \
-+libcblas.so.3.0 : libcblas.a libatlas.so
-+ ld $(LDFLAGS) -shared -soname libcblas.so.3 -o $@ \
- --whole-archive libcblas.a \
- --no-whole-archive -L. -latlas $(F77SYSLIB) -lm -lc
-
-@@ -89,35 +140,35 @@
- ar r $@ tmp/*.o
- rm -rf tmp
++
++
+ # ===================================================================
+ # The following commands are to build dynamic/shared objects on Linux
+ # using the gnu gcc or ld
+@@ -42,7 +95,7 @@
+ cptshared : fat_cptshared
+ cshared : fat_cshared
-atlas/libblas.so: atlas/libblas.a libatlas.so
-- ld $(LDFLAGS) -shared -soname libblas.so -o $@ \
-+atlas/libblas.so.3.0: atlas/libblas.a libatlas.so
-+ ld $(LDFLAGS) -shared -soname libblas.so.3 -o $@ \
++atlas/libblas.so: atlas/libblas.a libatlas.so.3.0
+ ld $(LDFLAGS) -shared -soname libblas.so -o $@ \
--whole-archive atlas/libblas.a \
--no-whole-archive $(F77SYSLIB) -lm -lc
-
--atlas/liblapack.so: atlas/liblapack.a atlas/libblas.so
-- ld $(LDFLAGS) -shared -soname liblapack.so -o $@ \
-+atlas/liblapack.so.3.0: atlas/liblapack.a atlas/libblas.so
-+ ld $(LDFLAGS) -shared -soname liblapack.so.3 -o $@ \
- --whole-archive atlas/liblapack.a \
- --no-whole-archive -L . -lblas $(F77SYSLIB) -lm -lc
- #
+@@ -207,22 +260,22 @@
# Builds one shared lib from all ATLAS files
#
fat_ptshared : # threaded target
-- ld $(LDFLAGS) -shared -soname libatlas.so -o libatlas.so \
-+ ld $(LDFLAGS) -shared -soname libatlas.so.3.0 -o libatlas.so.3.0 \
- --whole-archive liblapack_atlas.a libptf77blas.a libptcblas.a libatlas.a \
- --no-whole-archive -lc $(F77SYSLIB) $(LIBS)
- fat_shared : # unthreaded target
-- ld $(LDFLAGS) -shared -soname libatlas.so -o libatlas.so \
-+ ld $(LDFLAGS) -shared -soname libatlas.so.3.0 -o libatlas.so.3.0 \
- --whole-archive liblapack_atlas.a libf77blas.a libcblas.a libatlas.a \
- --no-whole-archive -lc $(F77SYSLIB) $(LIBS)
+- $(MAKE) TRYALL outso=libtatlas.so \
++ $(MAKE) TRYALL outso=libtatlas.so.3.0 \
+ libas="libptlapack.a libptf77blas.a libptcblas.a libatlas.a" \
+ LIBINSTdir="$(LIBINSTdir)"
+ fat_shared : # serial target
+- $(MAKE) TRYALL outso=libsatlas.so \
++ $(MAKE) TRYALL outso=libsatlas.so.3.0 \
+ libas="liblapack_atlas.a libf77blas.a libcblas.a libatlas.a" \
+ LIBINSTdir="$(LIBINSTdir)"
#
# Builds shared lib, not include fortran codes from LAPACK
#
- fat_cptshared : libclapack_atlas.a # threaded target
-- ld $(LDFLAGS) -shared -soname libcatlas.so -o libcatlas.so \
-+ ld $(LDFLAGS) -shared -soname libcatlas.so.3.0 -o libcatlas.so.3.0 \
- --whole-archive libclapack_atlas.a libptcblas.a libatlas.a \
- --no-whole-archive -lc $(LIBS)
- fat_cshared : libclapack_atlas.a # unthreaded target
-- ld $(LDFLAGS) -shared -soname libcatlas.so -o libcatlas.so \
-+ ld $(LDFLAGS) -shared -soname libcatlas.so.3.0 -o libcatlas.so.3.0 \
- --whole-archive libclapack_atlas.a libcblas.a libatlas.a \
- --no-whole-archive -lc $(LIBS)
+ fat_cptshared : libptclapack.a # threaded target
+- $(MAKE) TRYALL outso=libtatlas.so \
++ $(MAKE) TRYALL outso=libtatlas.so.3.0 \
+ libas="libptclapack.a libptcblas.a libatlas.a" \
+ LIBINSTdir="$(LIBINSTdir)"
+ fat_cshared : libclapack.a # unthreaded target
+- $(MAKE) TRYALL outso=libsatlas.so \
++ $(MAKE) TRYALL outso=libsatlas.so.3.0 \
+ libas="libclapack.a libcblas.a libatlas.a" \
+ LIBINSTdir="$(LIBINSTdir)"
-@@ -135,10 +186,10 @@
+@@ -327,12 +380,12 @@
-Wl,--rpath ./
xtry_lp:
-- $(ICC) $(CDEFS) -o $@ $(mySRCdir)/qr.c libatlas.so -Wl,--rpath ./
-+ $(ICC) $(CDEFS) -o $@ $(mySRCdir)/qr.c libatlas.so.3.0 -Wl,--rpath ./
+- $(ICC) $(CDEFS) -o $@ $(mySRCdir)/qr.c libsatlas.so -Wl,--rpath ./
++ $(ICC) $(CDEFS) -o $@ $(mySRCdir)/qr.c libsatlas.so.3.0 -Wl,--rpath ./
+ xtry_lp_pt:
+- $(ICC) $(CDEFS) -o $@ $(mySRCdir)/qr.c libtatlas.so -Wl,--rpath ./
++ $(ICC) $(CDEFS) -o $@ $(mySRCdir)/qr.c libtatlas.so.3.0 -Wl,--rpath ./
xtry :
-- $(ICC) $(CDEFS) -o $@ $(mySRCdir)/test_dynlink.c libatlas.so \
-+ $(ICC) $(CDEFS) -o $@ $(mySRCdir)/test_dynlink.c libatlas.so.3.0 \
+- $(ICC) $(CDEFS) -o $@ $(mySRCdir)/test_dynlink.c libsatlas.so \
++ $(ICC) $(CDEFS) -o $@ $(mySRCdir)/test_dynlink.c libsatlas.so.3.0 \
-Wl,--rpath ./
- xtry_c :
-- $(ICC) $(CDEFS) -o $@ $(mySRCdir)/test_dynlink.c libcatlas.so \
-+ $(ICC) $(CDEFS) -o $@ $(mySRCdir)/test_dynlink.c libcatlas.so.3.0 \
+ xtry_pt :
+- $(ICC) $(CDEFS) -o $@ $(mySRCdir)/test_dynlink.c libtatlas.so \
++ $(ICC) $(CDEFS) -o $@ $(mySRCdir)/test_dynlink.c libtatlas.so.3.0 \
-Wl,--rpath ./
Copied: packages/atlas/branches/3.10/debian/patches/08_install_shared_lib_call.diff (from r45249, packages/atlas/trunk/debian/patches/08_install_shared_lib_call.diff)
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/branches/3.10/debian/patches/08_install_shared_lib_call.diff?rev=45442&op=diff
==============================================================================
--- packages/atlas/trunk/debian/patches/08_install_shared_lib_call.diff (original)
+++ packages/atlas/branches/3.10/debian/patches/08_install_shared_lib_call.diff Thu Dec 6 09:05:46 2012
@@ -1,8 +1,8 @@
-Index: ATLAS/CONFIG/src/Makefile
+Index: atlas-3.10.0/CONFIG/src/Makefile
===================================================================
---- ATLAS.orig/CONFIG/src/Makefile 2012-07-16 15:34:19.000000000 +0200
-+++ ATLAS/CONFIG/src/Makefile 2012-07-16 15:34:21.000000000 +0200
-@@ -367,6 +367,7 @@
+--- atlas-3.10.0.orig/CONFIG/src/Makefile 2012-07-16 16:17:24.000000000 +0200
++++ atlas-3.10.0/CONFIG/src/Makefile 2012-07-16 16:20:02.000000000 +0200
+@@ -576,6 +576,7 @@
install : $(INCINSTdir) $(LIBINSTdir) $(INCINSTdir)/atlas
$(MAKE) -f Make.top install_inc INSTdir=$(INCINSTdir)
$(MAKE) -f Make.top install_static_lib INSTdir=$(LIBINSTdir)
Copied: packages/atlas/branches/3.10/debian/patches/09_mkdir_inst_dir.diff (from r45249, packages/atlas/trunk/debian/patches/09_mkdir_inst_dir.diff)
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/branches/3.10/debian/patches/09_mkdir_inst_dir.diff?rev=45442&op=diff
==============================================================================
--- packages/atlas/trunk/debian/patches/09_mkdir_inst_dir.diff (original)
+++ packages/atlas/branches/3.10/debian/patches/09_mkdir_inst_dir.diff Thu Dec 6 09:05:46 2012
@@ -1,8 +1,8 @@
-Index: ATLAS/Make.top
+Index: atlas-3.10.0/Make.top
===================================================================
---- ATLAS.orig/Make.top 2012-07-16 15:34:19.000000000 +0200
-+++ ATLAS/Make.top 2012-07-16 15:35:25.000000000 +0200
-@@ -298,6 +298,7 @@
+--- atlas-3.10.0.orig/Make.top 2012-07-16 16:17:24.000000000 +0200
++++ atlas-3.10.0/Make.top 2012-07-16 16:20:06.000000000 +0200
+@@ -664,6 +664,7 @@
- chmod 0644 $(INSTdir)/atlas/*
install_static_lib:
@@ -10,8 +10,8 @@
cp $(LIBdir)/libatlas.a $(INSTdir)/.
cp $(LIBdir)/libcblas.a $(INSTdir)/.
cp $(LIBdir)/liblapack_atlas.a $(INSTdir)/.
-@@ -313,6 +314,7 @@
- - chmod 0644 $(INSTdir)/libptcblas.a $(INSTdir)/libptf77blas.a
+@@ -686,6 +687,7 @@
+ - cp $(LIBdir)/libtatlas.so $(INSTdir)/.
install_shared_lib:
+ mkdir -p $(INSTdir)/atlas
Copied: packages/atlas/branches/3.10/debian/patches/10_s390.diff (from r45249, packages/atlas/trunk/debian/patches/10_s390.diff)
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/branches/3.10/debian/patches/10_s390.diff?rev=45442&op=diff
==============================================================================
--- packages/atlas/trunk/debian/patches/10_s390.diff (original)
+++ packages/atlas/branches/3.10/debian/patches/10_s390.diff Thu Dec 6 09:05:46 2012
@@ -1,27 +1,8 @@
-Index: ATLAS/CONFIG/include/atlconf.h
+Index: atlas-3.10.0/CONFIG/src/SpewMakeInc.c
===================================================================
---- ATLAS.orig/CONFIG/include/atlconf.h 2011-05-14 19:33:24.000000000 +0200
-+++ ATLAS/CONFIG/include/atlconf.h 2012-07-16 15:39:21.000000000 +0200
-@@ -51,6 +51,14 @@
- #endif
- #define MachIsPPC(mach_) \
- ( (mach_) >= PPCG4 && (mach_) <= PPCG5 )
-+#ifdef __s390__
-+#define MachIsS390(mach_) \
-+ ( __s390__ )
-+#else
-+#define MachIsS390(mach_) \
-+ ( 0 )
-+#endif
-+
-
- static char *f2c_namestr[5] = {"UNKNOWN","Add_", "Add__", "NoChange", "UpCase"};
- static char *f2c_intstr[5] =
-Index: ATLAS/CONFIG/src/SpewMakeInc.c
-===================================================================
---- ATLAS.orig/CONFIG/src/SpewMakeInc.c 2012-07-16 15:34:10.000000000 +0200
-+++ ATLAS/CONFIG/src/SpewMakeInc.c 2012-07-16 15:39:21.000000000 +0200
-@@ -340,6 +340,8 @@
+--- atlas-3.10.0.orig/CONFIG/src/SpewMakeInc.c 2012-07-16 16:11:36.000000000 +0200
++++ atlas-3.10.0/CONFIG/src/SpewMakeInc.c 2012-07-16 16:20:12.000000000 +0200
+@@ -391,6 +391,8 @@
if (MachIsIA64(arch))
return(sp);
@@ -29,12 +10,12 @@
+ return(sp);
if (MachIsMIPS(arch))
return((ptrbits == 64) ? "-mabi=64" : "-mabi=n32");
- if (!CompIsGcc(comp))
-Index: ATLAS/CONFIG/src/probe_comp.c
+ if (MachIsS390(arch))
+Index: atlas-3.10.0/CONFIG/src/probe_comp.c
===================================================================
---- ATLAS.orig/CONFIG/src/probe_comp.c 2011-05-14 19:33:24.000000000 +0200
-+++ ATLAS/CONFIG/src/probe_comp.c 2012-07-16 15:39:21.000000000 +0200
-@@ -507,6 +507,8 @@
+--- atlas-3.10.0.orig/CONFIG/src/probe_comp.c 2012-07-10 21:22:50.000000000 +0200
++++ atlas-3.10.0/CONFIG/src/probe_comp.c 2012-07-16 16:20:12.000000000 +0200
+@@ -580,6 +580,8 @@
if (MachIsIA64(arch))
return(sp);
@@ -42,4 +23,4 @@
+ return(sp);
if (MachIsMIPS(arch))
return((ptrbits == 64) ? "-mabi=64" : "-mabi=n32");
- if (!CompIsGcc(comp))
+ if (MachIsS390(arch))
Copied: packages/atlas/branches/3.10/debian/patches/12_check-exists.diff (from r45249, packages/atlas/trunk/debian/patches/12_check-exists.diff)
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/branches/3.10/debian/patches/12_check-exists.diff?rev=45442&op=diff
==============================================================================
--- packages/atlas/trunk/debian/patches/12_check-exists.diff (original)
+++ packages/atlas/branches/3.10/debian/patches/12_check-exists.diff Thu Dec 6 09:05:46 2012
@@ -1,61 +1,9 @@
-Index: ATLAS/Make.top
+Index: atlas-3.10.0/Make.top
===================================================================
---- ATLAS.orig/Make.top 2012-07-16 15:35:25.000000000 +0200
-+++ ATLAS/Make.top 2012-07-16 15:39:25.000000000 +0200
-@@ -123,31 +123,31 @@
- $(MAKE) -f Make.top leafstart leaf=lib/atlas
- $(MAKE) -f Make.top leafstart leaf=lib
- $(MAKE) -f Make.top leafstart leaf=bin
-- cd src/blas/gemm ; mkdir KERNEL
-- cd tune/blas/gemm ; mkdir KERNEL
-- cd tune/blas/gemm ; mkdir res
-- cd tune/blas/gemv ; mkdir res
-- cd tune/blas/ger ; mkdir res
-- cd tune/blas/level1 ; mkdir res
-- cd tune/blas/level1 ; mkdir GEN
-- cd tune/blas/level3 ; mkdir res
-- cd tune/sysinfo ; mkdir res
-- cd bin ; mkdir INSTALL_LOG
-- cd tune/blas/gemv ; ln -s $(SRCdir)/tune/blas/gemv/CASES CASES
-- cd tune/blas/ger ; ln -s $(SRCdir)/tune/blas/ger/CASES CASES
-- cd tune/blas/gemm ; ln -s $(SRCdir)/tune/blas/gemm/CASES CASES
-- cd tune/blas/level1 ; ln -s $(SRCdir)/tune/blas/level1/SWAP SWAP
-- cd tune/blas/level1 ; ln -s $(SRCdir)/tune/blas/level1/SET SET
-- cd tune/blas/level1 ; ln -s $(SRCdir)/tune/blas/level1/SCAL SCAL
-- cd tune/blas/level1 ; ln -s $(SRCdir)/tune/blas/level1/ROT ROT
-- cd tune/blas/level1 ; ln -s $(SRCdir)/tune/blas/level1/NRM2 NRM2
-- cd tune/blas/level1 ; ln -s $(SRCdir)/tune/blas/level1/IAMAX IAMAX
-- cd tune/blas/level1 ; ln -s $(SRCdir)/tune/blas/level1/DOT DOT
-- cd tune/blas/level1 ; ln -s $(SRCdir)/tune/blas/level1/CPSC CPSC
-- cd tune/blas/level1 ; ln -s $(SRCdir)/tune/blas/level1/COPY COPY
-- cd tune/blas/level1 ; ln -s $(SRCdir)/tune/blas/level1/AXPY AXPY
-- cd tune/blas/level1 ; ln -s $(SRCdir)/tune/blas/level1/AXPBY AXPBY
-- cd tune/blas/level1 ; ln -s $(SRCdir)/tune/blas/level1/ASUM ASUM
-+ cd src/blas/gemm ; if test ! -d KERNEL; then mkdir KERNEL; fi
-+ cd tune/blas/gemm ; if test ! -d KERNEL; then mkdir KERNEL; fi
-+ cd tune/blas/gemm ; if test ! -d res; then mkdir res; fi
-+ cd tune/blas/gemv ; if test ! -d res; then mkdir res; fi
-+ cd tune/blas/ger ; if test ! -d res; then mkdir res; fi
-+ cd tune/blas/level1 ; if test ! -d res; then mkdir res; fi
-+ cd tune/blas/level1 ; if test ! -d GEN; then mkdir GEN; fi
-+ cd tune/blas/level3 ; if test ! -d res; then mkdir res; fi
-+ cd tune/sysinfo ; if test ! -d res; then mkdir res; fi
-+ cd bin ; if test ! -d INSTALL_LOG; then mkdir INSTALL_LOG; fi
-+ cd tune/blas/gemv ; if test ! -h CASES; then ln -s $(SRCdir)/tune/blas/gemv/CASES CASES; fi
-+ cd tune/blas/ger ; if test ! -h CASES; then ln -s $(SRCdir)/tune/blas/ger/CASES CASES; fi
-+ cd tune/blas/gemm ; if test ! -h CASES; then ln -s $(SRCdir)/tune/blas/gemm/CASES CASES; fi
-+ cd tune/blas/level1 ; if test ! -h SWAP; then ln -s $(SRCdir)/tune/blas/level1/SWAP SWAP; fi
-+ cd tune/blas/level1 ; if test ! -h SET; then ln -s $(SRCdir)/tune/blas/level1/SET SET; fi
-+ cd tune/blas/level1 ; if test ! -h SCAL; then ln -s $(SRCdir)/tune/blas/level1/SCAL SCAL; fi
-+ cd tune/blas/level1 ; if test ! -h ROT; then ln -s $(SRCdir)/tune/blas/level1/ROT ROT; fi
-+ cd tune/blas/level1 ; if test ! -h NRM2; then ln -s $(SRCdir)/tune/blas/level1/NRM2 NRM2; fi
-+ cd tune/blas/level1 ; if test ! -h IAMAX; then ln -s $(SRCdir)/tune/blas/level1/IAMAX IAMAX; fi
-+ cd tune/blas/level1 ; if test ! -h DOT; then ln -s $(SRCdir)/tune/blas/level1/DOT DOT; fi
-+ cd tune/blas/level1 ; if test ! -h CPSC; then ln -s $(SRCdir)/tune/blas/level1/CPSC CPSC; fi
-+ cd tune/blas/level1 ; if test ! -h COPY; then ln -s $(SRCdir)/tune/blas/level1/COPY COPY; fi
-+ cd tune/blas/level1 ; if test ! -h AXPY; then ln -s $(SRCdir)/tune/blas/level1/AXPY AXPY; fi
-+ cd tune/blas/level1 ; if test ! -h AXPBY; then ln -s $(SRCdir)/tune/blas/level1/AXPBY AXPBY; fi
-+ cd tune/blas/level1 ; if test ! -h ASUM; then ln -s $(SRCdir)/tune/blas/level1/ASUM ASUM; fi
- $(MAKE) -f Make.top refresh arch=$(arch)
-
- refresh :
+--- atlas-3.10.0.orig/Make.top 2012-07-16 16:20:06.000000000 +0200
++++ atlas-3.10.0/Make.top 2012-07-16 16:21:42.000000000 +0200
+@@ -704,3 +704,4 @@
+ chmod 0644 $(INSTdir)/atlas/lib$$lib.so.3 ;\
+ chmod 0644 $(INSTdir)/atlas/lib$$lib.so.3.0 ;\
+ done;
++
Copied: packages/atlas/branches/3.10/debian/patches/16_warning-removed.diff (from r45249, packages/atlas/trunk/debian/patches/16_warning-removed.diff)
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/branches/3.10/debian/patches/16_warning-removed.diff?rev=45442&op=diff
==============================================================================
--- packages/atlas/trunk/debian/patches/16_warning-removed.diff (original)
+++ packages/atlas/branches/3.10/debian/patches/16_warning-removed.diff Thu Dec 6 09:05:46 2012
@@ -1,58 +1,9 @@
-Index: ATLAS/CONFIG/src/Makefile
+Index: atlas-3.10.0/Make.top
===================================================================
---- ATLAS.orig/CONFIG/src/Makefile 2012-07-16 15:34:21.000000000 +0200
-+++ ATLAS/CONFIG/src/Makefile 2012-07-16 15:39:30.000000000 +0200
-@@ -300,26 +300,26 @@
- DoNothing:
-
- make_subdirs:
-- mkdir src bin tune interfaces
-- cd src ; mkdir testing auxil blas lapack pthreads
-+ mkdir src bin tune interfaces >/dev/null 2>&1
-+ cd src ; mkdir testing auxil blas lapack pthreads>/dev/null 2>&1
- cd src/blas ; \
-- mkdir reference gemv ger gemm level1 level2 level3 pklevel3
-- cd src/blas/reference ; mkdir level1 level2 level3
-- cd src/blas/level2 ; mkdir kernel
-- cd src/blas/pklevel3 ; mkdir gpmm sprk
-- cd src/blas/level3 ; mkdir rblas kernel
-- cd src/pthreads ; mkdir blas misc
-+ mkdir reference gemv ger gemm level1 level2 level3 pklevel3>/dev/null 2>&1
-+ cd src/blas/reference ; mkdir level1 level2 level3>/dev/null 2>&1
-+ cd src/blas/level2 ; mkdir kernel>/dev/null 2>&1
-+ cd src/blas/pklevel3 ; mkdir gpmm sprk>/dev/null 2>&1
-+ cd src/blas/level3 ; mkdir rblas kernel>/dev/null 2>&1
-+ cd src/pthreads ; mkdir blas misc>/dev/null 2>&1
- cd src/pthreads/blas ; mkdir level1 level2 level3
-- cd tune ; mkdir blas sysinfo
-- cd tune/blas ; mkdir gemm gemv ger level1 level3
-- cd interfaces ; mkdir blas lapack
-- cd interfaces/lapack ; mkdir C F77
-- cd interfaces/lapack/C ; mkdir src testing
-- cd interfaces/lapack/F77 ; mkdir src testing
-- cd interfaces/blas ; mkdir C F77
-- cd interfaces/blas/C ; mkdir src testing
-- cd interfaces/blas/F77 ; mkdir src testing
-- mkdir ARCHS
-+ cd tune ; mkdir blas sysinfo>/dev/null 2>&1
-+ cd tune/blas ; mkdir gemm gemv ger level1 level3>/dev/null 2>&1
-+ cd interfaces ; mkdir blas lapack>/dev/null 2>&1
-+ cd interfaces/lapack ; mkdir C F77>/dev/null 2>&1
-+ cd interfaces/lapack/C ; mkdir src testing>/dev/null 2>&1
-+ cd interfaces/lapack/F77 ; mkdir src testing>/dev/null 2>&1
-+ cd interfaces/blas ; mkdir C F77>/dev/null 2>&1
-+ cd interfaces/blas/C ; mkdir src testing>/dev/null 2>&1
-+ cd interfaces/blas/F77 ; mkdir src testing>/dev/null 2>&1
-+ mkdir ARCHS>/dev/null 2>&1
-
- #
- # Simple test returns error if directory doesn't exist
-Index: ATLAS/Make.top
-===================================================================
---- ATLAS.orig/Make.top 2012-07-16 15:39:25.000000000 +0200
-+++ ATLAS/Make.top 2012-07-16 15:39:30.000000000 +0200
-@@ -10,7 +10,7 @@
- mv error_$(ARCH).tar.gz error_$(ARCH).tgz
+--- atlas-3.10.0.orig/Make.top 2012-07-16 16:22:11.000000000 +0200
++++ atlas-3.10.0/Make.top 2012-07-16 16:22:19.000000000 +0200
+@@ -9,7 +9,7 @@
+ $(BZIP) error_$(ARCH).tar
leafstart:
- cd $(leaf) ; ln -s $(BLDdir)/Make.inc Make.inc
Copied: packages/atlas/branches/3.10/debian/patches/17_hppa.diff (from r45249, packages/atlas/trunk/debian/patches/17_hppa.diff)
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/branches/3.10/debian/patches/17_hppa.diff?rev=45442&op=diff
==============================================================================
--- packages/atlas/trunk/debian/patches/17_hppa.diff (original)
+++ packages/atlas/branches/3.10/debian/patches/17_hppa.diff Thu Dec 6 09:05:46 2012
@@ -1,11 +1,12 @@
-Index: ATLAS/CONFIG/include/atlconf.h
+Index: atlas-3.10.0/CONFIG/include/atlconf.h
===================================================================
---- ATLAS.orig/CONFIG/include/atlconf.h 2012-07-16 15:39:21.000000000 +0200
-+++ ATLAS/CONFIG/include/atlconf.h 2012-07-16 15:39:32.000000000 +0200
-@@ -58,6 +58,13 @@
+--- atlas-3.10.0.orig/CONFIG/include/atlconf.h 2012-07-10 21:22:50.000000000 +0200
++++ atlas-3.10.0/CONFIG/include/atlconf.h 2012-07-16 16:23:46.000000000 +0200
+@@ -62,7 +62,13 @@
+ ( (mach_) == ARMv7 )
#define MachIsS390(mach_) \
- ( 0 )
- #endif
+ ( (mach_) >= IbmZ9 && (mach_) <= IbmZ196 )
+-
+#ifdef __hppa__
+#define MachIsHPPA(mach_) \
+ ( __hppa__ )
@@ -14,13 +15,13 @@
+ ( 0 )
+#endif
-
static char *f2c_namestr[5] = {"UNKNOWN","Add_", "Add__", "NoChange", "UpCase"};
-Index: ATLAS/CONFIG/src/SpewMakeInc.c
+ static char *f2c_intstr[5] =
+Index: atlas-3.10.0/CONFIG/src/SpewMakeInc.c
===================================================================
---- ATLAS.orig/CONFIG/src/SpewMakeInc.c 2012-07-16 15:39:21.000000000 +0200
-+++ ATLAS/CONFIG/src/SpewMakeInc.c 2012-07-16 15:39:32.000000000 +0200
-@@ -342,6 +342,8 @@
+--- atlas-3.10.0.orig/CONFIG/src/SpewMakeInc.c 2012-07-16 16:20:12.000000000 +0200
++++ atlas-3.10.0/CONFIG/src/SpewMakeInc.c 2012-07-16 16:23:10.000000000 +0200
+@@ -393,6 +393,8 @@
return(sp);
if (MachIsS390(arch))
return(sp);
@@ -28,12 +29,12 @@
+ return(sp);
if (MachIsMIPS(arch))
return((ptrbits == 64) ? "-mabi=64" : "-mabi=n32");
- if (!CompIsGcc(comp))
-Index: ATLAS/CONFIG/src/probe_comp.c
+ if (MachIsS390(arch))
+Index: atlas-3.10.0/CONFIG/src/probe_comp.c
===================================================================
---- ATLAS.orig/CONFIG/src/probe_comp.c 2012-07-16 15:39:21.000000000 +0200
-+++ ATLAS/CONFIG/src/probe_comp.c 2012-07-16 15:39:32.000000000 +0200
-@@ -509,6 +509,8 @@
+--- atlas-3.10.0.orig/CONFIG/src/probe_comp.c 2012-07-16 16:20:12.000000000 +0200
++++ atlas-3.10.0/CONFIG/src/probe_comp.c 2012-07-16 16:23:10.000000000 +0200
+@@ -582,6 +582,8 @@
return(sp);
if (MachIsS390(arch))
return(sp);
@@ -41,4 +42,4 @@
+ return(sp);
if (MachIsMIPS(arch))
return((ptrbits == 64) ? "-mabi=64" : "-mabi=n32");
- if (!CompIsGcc(comp))
+ if (MachIsS390(arch))
Copied: packages/atlas/branches/3.10/debian/patches/18_alpha.diff (from r45249, packages/atlas/trunk/debian/patches/18_alpha.diff)
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/branches/3.10/debian/patches/18_alpha.diff?rev=45442&op=diff
==============================================================================
--- packages/atlas/trunk/debian/patches/18_alpha.diff (original)
+++ packages/atlas/branches/3.10/debian/patches/18_alpha.diff Thu Dec 6 09:05:46 2012
@@ -1,8 +1,8 @@
-Index: ATLAS/CONFIG/include/atlconf.h
+Index: atlas-3.10.0/CONFIG/include/atlconf.h
===================================================================
---- ATLAS.orig/CONFIG/include/atlconf.h 2012-07-16 15:39:32.000000000 +0200
-+++ ATLAS/CONFIG/include/atlconf.h 2012-07-16 15:39:32.000000000 +0200
-@@ -65,6 +65,13 @@
+--- atlas-3.10.0.orig/CONFIG/include/atlconf.h 2012-07-16 16:23:46.000000000 +0200
++++ atlas-3.10.0/CONFIG/include/atlconf.h 2012-07-16 16:24:10.000000000 +0200
+@@ -69,6 +69,13 @@
#define MachIsHPPA(mach_) \
( 0 )
#endif
@@ -14,13 +14,13 @@
+ ( 0 )
+#endif
-
static char *f2c_namestr[5] = {"UNKNOWN","Add_", "Add__", "NoChange", "UpCase"};
-Index: ATLAS/CONFIG/src/SpewMakeInc.c
+ static char *f2c_intstr[5] =
+Index: atlas-3.10.0/CONFIG/src/SpewMakeInc.c
===================================================================
---- ATLAS.orig/CONFIG/src/SpewMakeInc.c 2012-07-16 15:39:32.000000000 +0200
-+++ ATLAS/CONFIG/src/SpewMakeInc.c 2012-07-16 15:39:32.000000000 +0200
-@@ -344,6 +344,8 @@
+--- atlas-3.10.0.orig/CONFIG/src/SpewMakeInc.c 2012-07-16 16:23:10.000000000 +0200
++++ atlas-3.10.0/CONFIG/src/SpewMakeInc.c 2012-07-16 16:24:10.000000000 +0200
+@@ -395,6 +395,8 @@
return(sp);
if (MachIsHPPA(arch))
return(sp);
@@ -28,12 +28,12 @@
+ return(sp);
if (MachIsMIPS(arch))
return((ptrbits == 64) ? "-mabi=64" : "-mabi=n32");
- if (!CompIsGcc(comp))
-Index: ATLAS/CONFIG/src/probe_comp.c
+ if (MachIsS390(arch))
+Index: atlas-3.10.0/CONFIG/src/probe_comp.c
===================================================================
---- ATLAS.orig/CONFIG/src/probe_comp.c 2012-07-16 15:39:32.000000000 +0200
-+++ ATLAS/CONFIG/src/probe_comp.c 2012-07-16 15:39:32.000000000 +0200
-@@ -511,6 +511,8 @@
+--- atlas-3.10.0.orig/CONFIG/src/probe_comp.c 2012-07-16 16:23:10.000000000 +0200
++++ atlas-3.10.0/CONFIG/src/probe_comp.c 2012-07-16 16:24:10.000000000 +0200
+@@ -584,6 +584,8 @@
return(sp);
if (MachIsHPPA(arch))
return(sp);
@@ -41,4 +41,4 @@
+ return(sp);
if (MachIsMIPS(arch))
return((ptrbits == 64) ? "-mabi=64" : "-mabi=n32");
- if (!CompIsGcc(comp))
+ if (MachIsS390(arch))
Copied: packages/atlas/branches/3.10/debian/patches/20_armel.diff (from r45249, packages/atlas/trunk/debian/patches/20_armel.diff)
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/branches/3.10/debian/patches/20_armel.diff?rev=45442&op=diff
==============================================================================
--- packages/atlas/trunk/debian/patches/20_armel.diff (original)
+++ packages/atlas/branches/3.10/debian/patches/20_armel.diff Thu Dec 6 09:05:46 2012
@@ -1,8 +1,8 @@
-Index: ATLAS/CONFIG/include/atlconf.h
+Index: atlas-3.10.0/CONFIG/include/atlconf.h
===================================================================
---- ATLAS.orig/CONFIG/include/atlconf.h 2012-07-16 15:39:32.000000000 +0200
-+++ ATLAS/CONFIG/include/atlconf.h 2012-07-16 15:39:33.000000000 +0200
-@@ -72,6 +72,14 @@
+--- atlas-3.10.0.orig/CONFIG/include/atlconf.h 2012-07-16 16:24:10.000000000 +0200
++++ atlas-3.10.0/CONFIG/include/atlconf.h 2012-07-16 16:24:14.000000000 +0200
+@@ -76,6 +76,14 @@
#define MachIsALPHA(mach_) \
( 0 )
#endif
@@ -15,13 +15,13 @@
+#endif
+
-
static char *f2c_namestr[5] = {"UNKNOWN","Add_", "Add__", "NoChange", "UpCase"};
-Index: ATLAS/CONFIG/src/SpewMakeInc.c
+ static char *f2c_intstr[5] =
+Index: atlas-3.10.0/CONFIG/src/SpewMakeInc.c
===================================================================
---- ATLAS.orig/CONFIG/src/SpewMakeInc.c 2012-07-16 15:39:32.000000000 +0200
-+++ ATLAS/CONFIG/src/SpewMakeInc.c 2012-07-16 15:39:33.000000000 +0200
-@@ -346,6 +346,8 @@
+--- atlas-3.10.0.orig/CONFIG/src/SpewMakeInc.c 2012-07-16 16:24:10.000000000 +0200
++++ atlas-3.10.0/CONFIG/src/SpewMakeInc.c 2012-07-16 16:24:14.000000000 +0200
+@@ -397,6 +397,8 @@
return(sp);
if (MachIsALPHA(arch))
return(sp);
@@ -29,12 +29,12 @@
+ return(sp);
if (MachIsMIPS(arch))
return((ptrbits == 64) ? "-mabi=64" : "-mabi=n32");
- if (!CompIsGcc(comp))
-Index: ATLAS/CONFIG/src/probe_comp.c
+ if (MachIsS390(arch))
+Index: atlas-3.10.0/CONFIG/src/probe_comp.c
===================================================================
---- ATLAS.orig/CONFIG/src/probe_comp.c 2012-07-16 15:39:32.000000000 +0200
-+++ ATLAS/CONFIG/src/probe_comp.c 2012-07-16 15:39:33.000000000 +0200
-@@ -513,6 +513,8 @@
+--- atlas-3.10.0.orig/CONFIG/src/probe_comp.c 2012-07-16 16:24:10.000000000 +0200
++++ atlas-3.10.0/CONFIG/src/probe_comp.c 2012-07-16 16:24:14.000000000 +0200
+@@ -586,6 +586,8 @@
return(sp);
if (MachIsALPHA(arch))
return(sp);
@@ -42,4 +42,4 @@
+ return(sp);
if (MachIsMIPS(arch))
return((ptrbits == 64) ? "-mabi=64" : "-mabi=n32");
- if (!CompIsGcc(comp))
+ if (MachIsS390(arch))
Copied: packages/atlas/branches/3.10/debian/patches/21_mips2.diff (from r45249, packages/atlas/trunk/debian/patches/21_mips2.diff)
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/branches/3.10/debian/patches/21_mips2.diff?rev=45442&op=diff
==============================================================================
--- packages/atlas/trunk/debian/patches/21_mips2.diff (original)
+++ packages/atlas/branches/3.10/debian/patches/21_mips2.diff Thu Dec 6 09:05:46 2012
@@ -1,28 +1,26 @@
-Index: ATLAS/CONFIG/src/SpewMakeInc.c
+Index: atlas-3.10.0/CONFIG/src/SpewMakeInc.c
===================================================================
---- ATLAS.orig/CONFIG/src/SpewMakeInc.c 2012-07-16 15:39:33.000000000 +0200
-+++ ATLAS/CONFIG/src/SpewMakeInc.c 2012-07-16 15:39:34.000000000 +0200
-@@ -349,7 +349,8 @@
+--- atlas-3.10.0.orig/CONFIG/src/SpewMakeInc.c 2012-07-16 16:24:14.000000000 +0200
++++ atlas-3.10.0/CONFIG/src/SpewMakeInc.c 2012-07-16 16:25:18.000000000 +0200
+@@ -400,7 +400,7 @@
if (MachIsARMEL(arch))
return(sp);
if (MachIsMIPS(arch))
- return((ptrbits == 64) ? "-mabi=64" : "-mabi=n32");
-+ return(sp);
-+// return((ptrbits == 64) ? "-mabi=64" : "-mabi=n32");
++ return(sp);
+ if (MachIsS390(arch))
+ return((ptrbits == 64) ? "-m64" : "-m31");
if (!CompIsGcc(comp))
- {
- /*
-Index: ATLAS/CONFIG/src/probe_comp.c
+Index: atlas-3.10.0/CONFIG/src/probe_comp.c
===================================================================
---- ATLAS.orig/CONFIG/src/probe_comp.c 2012-07-16 15:39:33.000000000 +0200
-+++ ATLAS/CONFIG/src/probe_comp.c 2012-07-16 15:39:34.000000000 +0200
-@@ -516,7 +516,8 @@
+--- atlas-3.10.0.orig/CONFIG/src/probe_comp.c 2012-07-16 16:24:14.000000000 +0200
++++ atlas-3.10.0/CONFIG/src/probe_comp.c 2012-07-16 16:25:04.000000000 +0200
+@@ -589,7 +589,7 @@
if (MachIsARMEL(arch))
return(sp);
if (MachIsMIPS(arch))
- return((ptrbits == 64) ? "-mabi=64" : "-mabi=n32");
-+ return(sp);
-+// return((ptrbits == 64) ? "-mabi=64" : "-mabi=n32");
++ return(sp);
+ if (MachIsS390(arch))
+ return((ptrbits == 64) ? "-m64" : "-m31");
if (!CompIsGcc(comp))
- {
- /*
Copied: packages/atlas/branches/3.10/debian/patches/22_sh.diff (from r45249, packages/atlas/trunk/debian/patches/22_sh.diff)
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/branches/3.10/debian/patches/22_sh.diff?rev=45442&op=diff
==============================================================================
--- packages/atlas/trunk/debian/patches/22_sh.diff (original)
+++ packages/atlas/branches/3.10/debian/patches/22_sh.diff Thu Dec 6 09:05:46 2012
@@ -1,13 +1,11 @@
-Index: ATLAS/CONFIG/include/atlconf.h
+Index: atlas-3.10.0/CONFIG/include/atlconf.h
===================================================================
---- ATLAS.orig/CONFIG/include/atlconf.h 2012-07-16 15:39:33.000000000 +0200
-+++ ATLAS/CONFIG/include/atlconf.h 2012-07-16 15:39:35.000000000 +0200
-@@ -79,8 +79,13 @@
- #define MachIsARMEL(mach_) \
+--- atlas-3.10.0.orig/CONFIG/include/atlconf.h 2012-07-16 16:24:14.000000000 +0200
++++ atlas-3.10.0/CONFIG/include/atlconf.h 2012-07-16 16:28:04.000000000 +0200
+@@ -84,6 +84,14 @@
( 0 )
#endif
--
--
+
+#ifdef __sh__
+#define MachIsSH(mach_) \
+ ( __sh__ )
@@ -15,32 +13,33 @@
+#define MachIsSH(mach_) \
+ ( 0 )
+#endif
++
static char *f2c_namestr[5] = {"UNKNOWN","Add_", "Add__", "NoChange", "UpCase"};
static char *f2c_intstr[5] =
-Index: ATLAS/CONFIG/src/SpewMakeInc.c
+Index: atlas-3.10.0/CONFIG/src/SpewMakeInc.c
===================================================================
---- ATLAS.orig/CONFIG/src/SpewMakeInc.c 2012-07-16 15:39:34.000000000 +0200
-+++ ATLAS/CONFIG/src/SpewMakeInc.c 2012-07-16 15:39:35.000000000 +0200
-@@ -351,6 +351,8 @@
+--- atlas-3.10.0.orig/CONFIG/src/SpewMakeInc.c 2012-07-16 16:25:18.000000000 +0200
++++ atlas-3.10.0/CONFIG/src/SpewMakeInc.c 2012-07-16 16:27:42.000000000 +0200
+@@ -401,6 +401,8 @@
+ return(sp);
if (MachIsMIPS(arch))
- return(sp);
- // return((ptrbits == 64) ? "-mabi=64" : "-mabi=n32");
+ return(sp);
+ if (MachIsSH(arch))
-+ return(sp);
++ return(sp);
+ if (MachIsS390(arch))
+ return((ptrbits == 64) ? "-m64" : "-m31");
+ if (!CompIsGcc(comp))
+Index: atlas-3.10.0/CONFIG/src/probe_comp.c
+===================================================================
+--- atlas-3.10.0.orig/CONFIG/src/probe_comp.c 2012-07-16 16:25:04.000000000 +0200
++++ atlas-3.10.0/CONFIG/src/probe_comp.c 2012-07-16 16:26:15.000000000 +0200
+@@ -592,6 +592,8 @@
+ return(sp);
+ if (MachIsS390(arch))
+ return((ptrbits == 64) ? "-m64" : "-m31");
++ if (MachIsSH(arch))
++ return(sp);
if (!CompIsGcc(comp))
{
/*
-Index: ATLAS/CONFIG/src/probe_comp.c
-===================================================================
---- ATLAS.orig/CONFIG/src/probe_comp.c 2012-07-16 15:39:34.000000000 +0200
-+++ ATLAS/CONFIG/src/probe_comp.c 2012-07-16 15:39:35.000000000 +0200
-@@ -518,6 +518,8 @@
- if (MachIsMIPS(arch))
- return(sp);
- // return((ptrbits == 64) ? "-mabi=64" : "-mabi=n32");
-+ if (MachIsSH(arch))
-+ return(sp);
- if (!CompIsGcc(comp))
- {
- /*
Copied: packages/atlas/branches/3.10/debian/patches/kfreebsd.diff (from r45249, packages/atlas/trunk/debian/patches/kfreebsd.diff)
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/branches/3.10/debian/patches/kfreebsd.diff?rev=45442&op=diff
==============================================================================
--- packages/atlas/trunk/debian/patches/kfreebsd.diff (original)
+++ packages/atlas/branches/3.10/debian/patches/kfreebsd.diff Thu Dec 6 09:05:46 2012
@@ -1,16 +1,17 @@
-Index: ATLAS/CONFIG/src/SpewMakeInc.c
+Index: atlas-3.10.0/CONFIG/src/SpewMakeInc.c
===================================================================
---- ATLAS.orig/CONFIG/src/SpewMakeInc.c 2012-07-16 15:39:35.000000000 +0200
-+++ ATLAS/CONFIG/src/SpewMakeInc.c 2012-07-16 15:39:37.000000000 +0200
-@@ -682,8 +682,10 @@
- fprintf(fpout, " -melf_i386");
- else if (ptrbits == 64)
- fprintf(fpout, " -melf_x86_64");
-- if (OS == OSFreeBSD)
-+#ifdef __FreeBSD_kernel__
-+// if (OS == OSFreeBSD)
- fprintf(fpout, "_fbsd");
+--- atlas-3.10.0.orig/CONFIG/src/SpewMakeInc.c 2012-07-16 16:27:42.000000000 +0200
++++ atlas-3.10.0/CONFIG/src/SpewMakeInc.c 2012-07-16 16:31:28.000000000 +0200
+@@ -780,8 +780,10 @@
+ fprintf(fpout, " -melf_i386");
+ else if (ptrbits == 64)
+ fprintf(fpout, " -melf_x86_64");
+- if (OS == OSFreeBSD)
+- fprintf(fpout, "_fbsd");
++ #ifdef __FreeBSD_kernel__
++ fprintf(fpout, "_fbsd");
+#endif
++
+ }
}
- fprintf(fpout, "\n F77SYSLIB = %s\n", f77lib ? f77lib : "");
- fprintf(fpout, " BC = $(ICC)\n");
+ if (MachIsS390(mach))
Copied: packages/atlas/branches/3.10/debian/patches/series (from r45249, packages/atlas/trunk/debian/patches/series)
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/branches/3.10/debian/patches/series?rev=45442&op=diff
==============================================================================
--- packages/atlas/trunk/debian/patches/series (original)
+++ packages/atlas/branches/3.10/debian/patches/series Thu Dec 6 09:05:46 2012
@@ -14,6 +14,6 @@
20_armel.diff
21_mips2.diff
22_sh.diff
-23_fix_unresolvable_on_sh4.diff
-corei1.diff
+#23_fix_unresolvable_on_sh4.diff
+#corei1.diff
kfreebsd.diff
Copied: packages/atlas/branches/3.10/debian/rules (from r45249, packages/atlas/trunk/debian/rules)
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/branches/3.10/debian/rules?rev=45442&op=diff
==============================================================================
--- packages/atlas/trunk/debian/rules (original)
+++ packages/atlas/branches/3.10/debian/rules Thu Dec 6 09:05:46 2012
@@ -12,13 +12,14 @@
# First number in ARCHS:
# - 0 means Unknown CPU. Leave Atlas find out
# - 1 means POWER3, most generic PowerPC (see #680096)
-# - 26 means Generic x86 CPU
+# - 11 means artificial architecture called x86x87, providing you with portable (but slow!) architectural defaults.
+# See http://math-atlas.sourceforge.net/atlas_install/node28.html
# Second number in ARCHS:
# - 1 means no instruction set extension
-X86_ARCHS := amd64 i386 kfreebsd-amd64 kfreebsd-i386 hurd-i386
+X86_ARCHS := i386 kfreebsd-amd64 kfreebsd-i386 hurd-i386
PPC_ARCHS := powerpc powerpcspe ppc64
ifneq (,$(findstring $(DEB_HOST_ARCH),$(X86_ARCHS)))
-ARCHS=base_26_1
+ARCHS=base_11_1
else ifneq (,$(findstring $(DEB_HOST_ARCH),$(PPC_ARCHS)))
ARCHS=base_1_1
else
@@ -29,8 +30,10 @@
# # see what do we do with the amd64 / intel 64
ifeq ($(DEB_HOST_ARCH_CPU),amd64)
+# See: http://math-atlas.sourceforge.net/atlas_install/node30.html
# # 64 bits
-MODE_BITWIDTH = 64
+ARCHS=base_13_192
+MODE_BITWIDTH = 32
endif
ifeq ($(DEB_HOST_ARCH_CPU),ia64)
@@ -42,7 +45,7 @@
MODE_BITWIDTH = 64
endif
-GFORTRAN_LIB_PATH=`gcc -print-search-dirs|grep ^install:|awk '{print $$2}'`
+GFORTRAN_LIB_PATH=`$(CC) -print-search-dirs|grep ^install:|awk '{print $$2}'`
COMMON_CONFIG_PARAMS := --prefix="$(DEB_DESTDIR)" \
--incdir="$(DEB_DESTDIR)/usr/include/" \
@@ -54,7 +57,7 @@
-Fa alg '-Wa,--noexecstack -fPIC' \
-Ss f77lib "-L$(GFORTRAN_LIB_PATH) -lgfortran -lgcc_s -lpthread" \
-Ss pmake '$(MAKE)' \
- --with-netlib-lapack=/usr/lib/liblapack_pic.a \
+ -Ss flapack /usr/lib/liblapack_pic.a \
-A $$atlasArch \
-V $$atlasISA \
-v 2
More information about the debian-science-commits
mailing list