r44830 - in /packages/atlas/trunk/debian: README.Debian TODO changelog control patches/07_full_sonames.diff patches/09_mkdir_inst_dir.diff patches/23_fix_unresolvable_on_sh4.diff
sylvestre at users.alioth.debian.org
sylvestre at users.alioth.debian.org
Fri May 18 16:54:31 UTC 2012
Author: sylvestre
Date: Fri May 18 16:54:30 2012
New Revision: 44830
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44830
Log:
* libblas and liblapack were not correctly named causing upgrades to fails.
(Closes: #643767)
* Update the README.Debian and TODO regarding recent changes
Modified:
packages/atlas/trunk/debian/README.Debian
packages/atlas/trunk/debian/TODO
packages/atlas/trunk/debian/changelog
packages/atlas/trunk/debian/control
packages/atlas/trunk/debian/patches/07_full_sonames.diff
packages/atlas/trunk/debian/patches/09_mkdir_inst_dir.diff
packages/atlas/trunk/debian/patches/23_fix_unresolvable_on_sh4.diff
Modified: packages/atlas/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/trunk/debian/README.Debian?rev=44830&op=diff
==============================================================================
--- packages/atlas/trunk/debian/README.Debian (original)
+++ packages/atlas/trunk/debian/README.Debian Fri May 18 16:54:30 2012
@@ -27,10 +27,10 @@
http://wiki.debian.org/DebianScience/LinearAlgebraLibraries
BLAS:
-update-alternatives --config libblas.so.3gf
+update-alternatives --config libblas.so.3
LAPACK:
-update-alternatives --config liblapack.so.3gf
+update-alternatives --config liblapack.so.3
Building Optimized Atlas Packages on your ARCH
@@ -46,7 +46,7 @@
# fakeroot debian/rules custom
it should produce a package called:
-# ../libatlas3gf-base_*.deb
+# ../libatlas3-base_*.deb
which should be optimized for the architecture Atlas has been built on.
@@ -79,7 +79,7 @@
Most the information underneath are outdated. They are left here "in case".
- -- Sylvestre Ledru <sylvestre at debian.org> Wed, 24 Jun 2009 16:20:02 +0200
+ -- Sylvestre Ledru <sylvestre at debian.org>, Tue, 15 May 2012 18:05:34 +0200
Last update: Wed, 25 Aug 2010 21:42:25 +0200
Modified: packages/atlas/trunk/debian/TODO
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/trunk/debian/TODO?rev=44830&op=diff
==============================================================================
--- packages/atlas/trunk/debian/TODO (original)
+++ packages/atlas/trunk/debian/TODO Fri May 18 16:54:30 2012
@@ -1,3 +1,2 @@
* see it is worst keeping liblapack_atlas.a or rename it to liblapack.a
* Provide -dbg packages
-* get ride of the .3gf extensions
Modified: packages/atlas/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/trunk/debian/changelog?rev=44830&op=diff
==============================================================================
--- packages/atlas/trunk/debian/changelog (original)
+++ packages/atlas/trunk/debian/changelog Fri May 18 16:54:30 2012
@@ -1,8 +1,16 @@
+atlas (3.8.4-4~exp6) experimental; urgency=low
+
+ * Moved removal from postinst to preinst
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Fri, 18 May 2012 16:06:24 +0200
+
atlas (3.8.4-4~exp5) experimental; urgency=low
- * Moved removal from postinst to preinst
-
- -- Sylvestre Ledru <sylvestre at debian.org> Fri, 18 May 2012 16:06:24 +0200
+ * libblas and liblapack were not correctly named causing upgrades to fails.
+ (Closes: #643767)
+ * Update the README.Debian and TODO regarding recent changes
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Tue, 15 May 2012 18:06:16 +0200
atlas (3.8.4-4~exp4) experimental; urgency=low
Modified: packages/atlas/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/trunk/debian/control?rev=44830&op=diff
==============================================================================
--- packages/atlas/trunk/debian/control (original)
+++ packages/atlas/trunk/debian/control Fri May 18 16:54:30 2012
@@ -30,9 +30,9 @@
libatlas3gf-corei7sse3 (<< 3.8.3-25), libatlas3gf-altivec (<< 3.8.3-25),
libatlas3gf-v9 (<< 3.8.3-25), libatlas3gf-ev6 (<< 3.8.3-25),
libatlas3gf-2.0 (<< 3.8.3-25), libblas3gf (<< 1.2.20110419-3~exp1),
- libatlas3gf-base (<< 3.8.4-4~exp1), libopenblas-base ( <<0.1alpha2.2-4~exp1),
+ libatlas3gf-base (<< 3.8.4-4~exp4), libopenblas-base ( <<0.1alpha2.2-4~exp1),
liblapack3gf (<< 3.4.0-1~exp1)
-Breaks: libblas3gf (<< 1.2.20110419-3~exp1), libatlas3gf-base (<< 3.8.4-4~exp1),
+Breaks: libblas3gf (<< 1.2.20110419-3~exp1), libatlas3gf-base (<< 3.8.4-4~exp4),
libopenblas-base ( <<0.1alpha2.2-4~exp1), liblapack3gf (<< 3.4.0-1~exp1)
Suggests: ${libs:Suggests}, liblapack3
Description: Automatically Tuned Linear Algebra Software, generic shared
Modified: packages/atlas/trunk/debian/patches/07_full_sonames.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/trunk/debian/patches/07_full_sonames.diff?rev=44830&op=diff
==============================================================================
--- packages/atlas/trunk/debian/patches/07_full_sonames.diff (original)
+++ packages/atlas/trunk/debian/patches/07_full_sonames.diff Fri May 18 16:54:30 2012
@@ -38,21 +38,21 @@
install_shared_lib:
for lib in atlas cblas f77blas lapack_atlas; do \
- cp $(LIBdir)/lib$$lib.so $(INSTdir)/. ; \
-+ cp $(LIBdir)/lib$$lib.so.3gf.0 $(INSTdir)/. ; \
-+ ( cd $(INSTdir) && ln -s lib$$lib.so.3gf.0 lib$$lib.so.3gf); \
-+ ( cd $(INSTdir) && ln -s lib$$lib.so.3gf lib$$lib.so); \
++ cp $(LIBdir)/lib$$lib.so.3.0 $(INSTdir)/. ; \
++ ( cd $(INSTdir) && ln -s lib$$lib.so.3.0 lib$$lib.so.3); \
++ ( cd $(INSTdir) && ln -s lib$$lib.so.3 lib$$lib.so); \
chmod 0644 $(INSTdir)/lib$$lib.so ;\
-+ chmod 0644 $(INSTdir)/lib$$lib.so.3gf ;\
-+ chmod 0644 $(INSTdir)/lib$$lib.so.3gf.0 ;\
++ chmod 0644 $(INSTdir)/lib$$lib.so.3 ;\
++ chmod 0644 $(INSTdir)/lib$$lib.so.3.0 ;\
done;
for lib in blas lapack; do \
- cp $(LIBdir)/atlas/lib$$lib.so $(INSTdir)/atlas/. ; \
-+ cp $(LIBdir)/atlas/lib$$lib.so.3gf.0 $(INSTdir)/atlas/. ; \
-+ ( cd $(INSTdir)/atlas/ && ln -s lib$$lib.so.3gf.0 lib$$lib.so.3gf); \
-+ ( cd $(INSTdir)/atlas/ && ln -s lib$$lib.so.3gf lib$$lib.so); \
++ cp $(LIBdir)/atlas/lib$$lib.so.3.0 $(INSTdir)/atlas/. ; \
++ ( cd $(INSTdir)/atlas/ && ln -s lib$$lib.so.3.0 lib$$lib.so.3); \
++ ( cd $(INSTdir)/atlas/ && ln -s lib$$lib.so.3 lib$$lib.so); \
chmod 0644 $(INSTdir)/atlas/lib$$lib.so ;\
-+ chmod 0644 $(INSTdir)/atlas/lib$$lib.so.3gf ;\
-+ chmod 0644 $(INSTdir)/atlas/lib$$lib.so.3gf.0 ;\
++ chmod 0644 $(INSTdir)/atlas/lib$$lib.so.3 ;\
++ chmod 0644 $(INSTdir)/atlas/lib$$lib.so.3.0 ;\
done;
diff -urNad atlas-3.8.3~/makes/Make.lib atlas-3.8.3/makes/Make.lib
--- atlas-3.8.3~/makes/Make.lib 2009-08-25 08:09:25.000000000 -0700
@@ -62,16 +62,16 @@
mySRCdir = $(SRCdir)/lib
#
-# override with libatlas.so only when atlas is built to one lib
-+# override with libatlas.so.3gf.0 only when atlas is built to one lib
++# override with libatlas.so.3.0 only when atlas is built to one lib
#
-DYNlibs = liblapack_atlas.so libf77blas.so libcblas.so libatlas.so
-PTDYNlibs = liblapack_atlas.so libptf77blas.so libptcblas.so libatlas.so
-CDYNlibs = liblapack_atlas.so libcblas.so libatlas.so
-CPTDYNlibs = liblapack_atlas.so libptcblas.so libatlas.so
-+DYNlibs = liblapack_atlas.so.3gf.0 libf77blas.so.3gf.0 libcblas.so.3gf.0 libatlas.so.3gf.0
-+PTDYNlibs = liblapack_atlas.so.3gf.0 libptf77blas.so.3gf.0 libptcblas.so.3gf.0 libatlas.so.3gf.0
-+CDYNlibs = liblapack_atlas.so.3gf.0 libcblas.so.3gf.0 libatlas.so.3gf.0
-+CPTDYNlibs = liblapack_atlas.so.3gf.0 libptcblas.so.3gf.0 libatlas.so.3gf.0
++DYNlibs = liblapack_atlas.so.3.0 libf77blas.so.3.0 libcblas.so.3.0 libatlas.so.3.0
++PTDYNlibs = liblapack_atlas.so.3.0 libptf77blas.so.3.0 libptcblas.so.3.0 libatlas.so.3.0
++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.3
tarnam = atlas$(VER)_$(ARCH)
@@ -81,117 +81,117 @@
+# Soft link creation
+# XXX: I cannot make default rule work for some reason...
-+libatlas.so: libatlas.so.3gf
-+ rm -f $@
-+ ln -s $< $@
-+
-+libatlas.so.3gf: libatlas.so.3gf.0
-+ rm -f $@
-+ ln -s $< $@
-+
-+libcblas.so: libcblas.so.3gf
-+ rm -f $@
-+ ln -s $< $@
-+
-+libcblas.so.3gf: libcblas.so.3gf.0
-+ rm -f $@
-+ ln -s $< $@
-+
-+libf77blas.so: libf77blas.so.3gf
-+ rm -f $@
-+ ln -s $< $@
-+
-+libf77blas.so.3gf: libf77blas.so.3gf.0
-+ rm -f $@
-+ ln -s $< $@
-+
-+liblapack_atlas.so: liblapack_atlas.so.3gf
-+ rm -f $@
-+ ln -s $< $@
-+
-+liblapack_atlas.so.3gf: liblapack_atlas.so.3gf.0
-+ rm -f $@
-+ ln -s $< $@
-+
-+atlas/libblas.so: atlas/libblas.so.3gf
-+ rm -f $@
-+ (cd atlas && ln -s libblas.so.3gf libblas.so)
-+
-+atlas/libblas.so.3gf: atlas/libblas.so.3gf.0
-+ rm -f $@
-+ (cd atlas && ln -s libblas.so.3gf.0 libblas.so.3gf)
-+
-+atlas/liblapack.so: atlas/liblapack.so.3gf
-+ rm -f $@
-+ (cd atlas && ln -s liblapack.so.3gf liblapack.so)
-+
-+atlas/liblapack.so.3gf: atlas/liblapack.so.3gf.0
-+ rm -f $@
-+ (cd atlas && ln -s liblapack.so.3gf.0 liblapack.so.3gf)
++libatlas.so: libatlas.so.3
++ rm -f $@
++ ln -s $< $@
++
++libatlas.so.3: libatlas.so.3.0
++ rm -f $@
++ ln -s $< $@
++
++libcblas.so: libcblas.so.3
++ rm -f $@
++ ln -s $< $@
++
++libcblas.so.3: libcblas.so.3.0
++ rm -f $@
++ ln -s $< $@
++
++libf77blas.so: libf77blas.so.3
++ rm -f $@
++ ln -s $< $@
++
++libf77blas.so.3: libf77blas.so.3.0
++ rm -f $@
++ ln -s $< $@
++
++liblapack_atlas.so: liblapack_atlas.so.3
++ rm -f $@
++ ln -s $< $@
++
++liblapack_atlas.so.3: liblapack_atlas.so.3.0
++ rm -f $@
++ ln -s $< $@
++
++atlas/libblas.so: atlas/libblas.so.3
++ rm -f $@
++ (cd atlas && ln -s libblas.so.3 libblas.so)
++
++atlas/libblas.so.3: atlas/libblas.so.3.0
++ rm -f $@
++ (cd atlas && ln -s libblas.so.3.0 libblas.so.3)
++
++atlas/liblapack.so: atlas/liblapack.so.3
++ rm -f $@
++ (cd atlas && ln -s liblapack.so.3 liblapack.so)
++
++atlas/liblapack.so.3: atlas/liblapack.so.3.0
++ 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.3gf.0 liblapack_atlas.so.3gf.0
-+ $(MAKE) libatlas.so.3gf.0 liblapack_atlas.so.3gf.0 libptf77blas.so.3gf.0 libf77blas.so.3gf.0 \
-+ libptcblas.so.3gf.0 libcblas.so.3gf.0 liblapack_atlas.so.3gf.0
++ - 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.3gf.0 liblapack_atlas.so.3gf.0 libf77blas.so.3gf.0 libcblas.so.3gf.0 liblapack_atlas.so.3gf.0
-+ $(MAKE) libatlas.so.3gf.0 liblapack_atlas.so.3gf.0 libf77blas.so.3gf.0 libcblas.so.3gf.0 liblapack_atlas.so.3gf.0
++ - 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.3gf.0 atlas/liblapack.so.3gf.0
-+ $(MAKE) atlas/libblas.so.3gf.0 atlas/liblapack.so.3gf.0
++ - 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.3gf.0 libclapack_atlas.so.3gf.0
-+ $(MAKE) libatlas.so.3gf.0 libclapack_atlas.so.3gf.0 libptcblas.so.3gf.0 libcblas.so.3gf.0
++ - 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.3gf.0 libclapack_atlas.so.3gf.0
-+ $(MAKE) libatlas.so.3gf.0 libclapack_atlas.so.3gf.0 libcblas.so.3gf.0
++ - 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.3gf.0 : libatlas.a
-+ ld $(LDFLAGS) -shared -soname libatlas.so.3gf -o $@ \
++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.3gf.0 : liblapack_atlas.a libatlas.so libcblas.so libf77blas.so
-+ ld $(LDFLAGS) -shared -soname liblapack_atlas.so.3gf -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.3gf.0 : libclapack_atlas.a
-+ ld $(LDFLAGS) -shared -soname liblapack_atlas.so.3gf.0 -o liblapack_atlas.so.3gf.0 \
++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.3gf.0 : 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.3gf.0 : libf77blas.a libcblas.so libatlas.so
-+ ld $(LDFLAGS) -shared -soname libf77blas.so.3gf -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.3gf.0 : 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.3gf.0 : libcblas.a libatlas.so
-+ ld $(LDFLAGS) -shared -soname libcblas.so.3gf -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
@@ -201,15 +201,15 @@
-atlas/libblas.so: atlas/libblas.a libatlas.so
- ld $(LDFLAGS) -shared -soname libblas.so -o $@ \
-+atlas/libblas.so.3gf.0: atlas/libblas.a libatlas.so
-+ ld $(LDFLAGS) -shared -soname libblas.so.3gf -o $@ \
++atlas/libblas.so.3.0: atlas/libblas.a libatlas.so
++ ld $(LDFLAGS) -shared -soname libblas.so.3 -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.3gf.0: atlas/liblapack.a atlas/libblas.so
-+ ld $(LDFLAGS) -shared -soname liblapack.so.3gf -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
#
@@ -217,12 +217,12 @@
#
fat_ptshared : # threaded target
- ld $(LDFLAGS) -shared -soname libatlas.so -o libatlas.so \
-+ ld $(LDFLAGS) -shared -soname libatlas.so.3gf.0 -o libatlas.so.3gf.0 \
++ 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.3gf.0 -o libatlas.so.3gf.0 \
++ 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)
#
@@ -230,12 +230,12 @@
#
fat_cptshared : libclapack_atlas.a # threaded target
- ld $(LDFLAGS) -shared -soname libcatlas.so -o libcatlas.so \
-+ ld $(LDFLAGS) -shared -soname libcatlas.so.3gf.0 -o libcatlas.so.3gf.0 \
++ 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.3gf.0 -o libcatlas.so.3gf.0 \
++ 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)
@@ -244,12 +244,12 @@
xtry_lp:
- $(ICC) $(CDEFS) -o $@ $(mySRCdir)/qr.c libatlas.so -Wl,--rpath ./
-+ $(ICC) $(CDEFS) -o $@ $(mySRCdir)/qr.c libatlas.so.3gf.0 -Wl,--rpath ./
++ $(ICC) $(CDEFS) -o $@ $(mySRCdir)/qr.c libatlas.so.3.0 -Wl,--rpath ./
xtry :
- $(ICC) $(CDEFS) -o $@ $(mySRCdir)/test_dynlink.c libatlas.so \
-+ $(ICC) $(CDEFS) -o $@ $(mySRCdir)/test_dynlink.c libatlas.so.3gf.0 \
++ $(ICC) $(CDEFS) -o $@ $(mySRCdir)/test_dynlink.c libatlas.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.3gf.0 \
++ $(ICC) $(CDEFS) -o $@ $(mySRCdir)/test_dynlink.c libcatlas.so.3.0 \
-Wl,--rpath ./
Modified: packages/atlas/trunk/debian/patches/09_mkdir_inst_dir.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/trunk/debian/patches/09_mkdir_inst_dir.diff?rev=44830&op=diff
==============================================================================
--- packages/atlas/trunk/debian/patches/09_mkdir_inst_dir.diff (original)
+++ packages/atlas/trunk/debian/patches/09_mkdir_inst_dir.diff Fri May 18 16:54:30 2012
@@ -14,5 +14,5 @@
install_shared_lib:
+ mkdir -p $(INSTdir)/atlas
for lib in atlas cblas f77blas lapack_atlas; do \
- cp $(LIBdir)/lib$$lib.so.3gf.0 $(INSTdir)/. ; \
- ( cd $(INSTdir) && ln -s lib$$lib.so.3gf.0 lib$$lib.so.3gf); \
+ cp $(LIBdir)/lib$$lib.so.3.0 $(INSTdir)/. ; \
+ ( cd $(INSTdir) && ln -s lib$$lib.so.3.0 lib$$lib.so.3); \
Modified: packages/atlas/trunk/debian/patches/23_fix_unresolvable_on_sh4.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/trunk/debian/patches/23_fix_unresolvable_on_sh4.diff?rev=44830&op=diff
==============================================================================
--- packages/atlas/trunk/debian/patches/23_fix_unresolvable_on_sh4.diff (original)
+++ packages/atlas/trunk/debian/patches/23_fix_unresolvable_on_sh4.diff Fri May 18 16:54:30 2012
@@ -2,10 +2,10 @@
+++ b/makes/Make.lib 2010-12-01 11:25:06.000000000 +0900
@@ -101,7 +101,7 @@
- libatlas.so.3gf.0 : libatlas.a
- ld $(LDFLAGS) -shared -soname libatlas.so.3gf -o $@ \
+ libatlas.so.3.0 : libatlas.a
+ ld $(LDFLAGS) -shared -soname libatlas.so.3 -o $@ \
- --whole-archive libatlas.a --no-whole-archive -lc $(LIBS)
+ --whole-archive libatlas.a --no-whole-archive -lc $(LIBS) $(F77SYSLIB)
- liblapack_atlas.so.3gf.0 : liblapack_atlas.a libatlas.so libcblas.so libf77blas.so
- ld $(LDFLAGS) -shared -soname liblapack_atlas.so.3gf -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 \
More information about the debian-science-commits
mailing list