[SCM] ATLAS packaging for Debian branch, master, updated. upstream/3.8.4-16-gede4b56
Sébastien Villemot
sebastien at debian.org
Wed Jun 5 16:07:35 UTC 2013
The following commit has been merged in the master branch:
commit 84ad9184e574e8364bc0bdbffe930fc65a0ae050
Author: Sébastien Villemot <sebastien at debian.org>
Date: Wed Jun 5 17:16:28 2013 +0200
Fix and simplify the patches relative to the build system
diff --git a/debian/patches/03_full_blas_lapack.diff b/debian/patches/03_full_blas_lapack.diff
deleted file mode 100644
index 385bc62..0000000
--- a/debian/patches/03_full_blas_lapack.diff
+++ /dev/null
@@ -1,58 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_full_blas_lapack.dpatch.dpatch by <david at evans>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Build full drop-in replacements for BLAS and LAPACK.
-
- at DPATCH@
-
-Index: ATLAS/Make.top
-===================================================================
---- ATLAS.orig/Make.top 2013-01-09 17:41:59.000000000 +0100
-+++ ATLAS/Make.top 2013-01-09 17:42:05.000000000 +0100
-@@ -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/threads ; touch atomic.inc
-@@ -591,6 +592,7 @@
-
- lib :
- mkdir lib
-+ mkdir lib/atlas
-
- include:
- mkdir include
-Index: ATLAS/makes/Make.lib
-===================================================================
---- ATLAS.orig/makes/Make.lib 2013-01-09 17:41:59.000000000 +0100
-+++ ATLAS/makes/Make.lib 2013-01-09 17:42:05.000000000 +0100
-@@ -175,6 +175,25 @@
- LIBS="$(LIBS)" LIBINSTdir="$(LIBINSTdir)" ; \
- fi
-
-+
-+# Build full netlib blas/lapack libraries:
-+atlas/libblas.a: libatlas.a libptf77blas.a libptcblas.a
-+ mkdir tmp
-+ (cd tmp && ar x ../libatlas.a);
-+ (cd tmp && ar x ../libptf77blas.a);
-+ (cd tmp && ar x ../libptcblas.a);
-+ ar r $@ tmp/*.o
-+ rm -rf tmp
-+
-+atlas/liblapack.a: liblapack_atlas.a libatlas.a
-+ mkdir tmp
-+ (cd tmp && ar x /usr/lib/liblapack_pic.a);
-+ (cd tmp && ar x ../liblapack_atlas.a);
-+ (cd tmp && ar x ../libptcblas.a);
-+ ar r $@ tmp/*.o
-+ rm -rf tmp
-+
-+
- #
- # Builds one shared lib from all ATLAS files
- #
diff --git a/debian/patches/05_shared_full_blas.diff b/debian/patches/05_shared_full_blas.diff
deleted file mode 100644
index c0e3521..0000000
--- a/debian/patches/05_shared_full_blas.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05_shared_full_blas.dpatch by <david at evans>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-Index: ATLAS/makes/Make.lib
-===================================================================
---- ATLAS.orig/makes/Make.lib 2013-01-09 17:42:05.000000000 +0100
-+++ ATLAS/makes/Make.lib 2013-01-09 17:42:06.000000000 +0100
-@@ -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 $@ \
-+ --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 $@ \
-+ --whole-archive atlas/liblapack.a \
-+ --no-whole-archive -L . -lblas $(F77SYSLIB) -lm -lc
- #
- # These are a bunch of different ways to attempt to build a .so, try them all
- #
diff --git a/debian/patches/06_install_shared.diff b/debian/patches/06_install_shared.diff
deleted file mode 100644
index a99feb1..0000000
--- a/debian/patches/06_install_shared.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 06_install_shared.dpatch by <david at evans>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-Index: ATLAS/Make.top
-===================================================================
---- ATLAS.orig/Make.top 2013-01-09 17:42:06.000000000 +0100
-+++ ATLAS/Make.top 2013-01-09 17:42:07.000000000 +0100
-@@ -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 \
-+ cp $(LIBdir)/lib$$lib.so $(INSTdir)/. ; \
-+ chmod 0644 $(INSTdir)/lib$$lib.so ;\
-+ done;
-+ for lib in blas lapack; do \
-+ cp $(LIBdir)/atlas/lib$$lib.so $(INSTdir)/atlas/. ; \
-+ chmod 0644 $(INSTdir)/atlas/lib$$lib.so ;\
-+ done;
diff --git a/debian/patches/07_full_sonames.diff b/debian/patches/07_full_sonames.diff
deleted file mode 100644
index 97bd1be..0000000
--- a/debian/patches/07_full_sonames.diff
+++ /dev/null
@@ -1,193 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 07_full_sonames.dpatch by <david at evans>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-Index: ATLAS/CONFIG/src/Makefile
-===================================================================
---- ATLAS.orig/CONFIG/src/Makefile 2013-01-09 17:42:06.000000000 +0100
-+++ ATLAS/CONFIG/src/Makefile 2013-01-09 17:42:07.000000000 +0100
-@@ -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)
-+install_headers : $(INCINSTdir) $(INCINSTdir)/atlas
-+ $(MAKE) -f Make.top install_inc INSTdir=$(INCINSTdir)
-+install_static : $(LIBINSTdir) $(LIBINSTdir)/atlas
-+ $(MAKE) -f Make.top install_static_lib INSTdir=$(LIBINSTdir)
-+install_shared : $(LIBINSTdir) $(LIBINSTdir)/atlas
-+ $(MAKE) -f Make.top install_shared_lib INSTdir=$(LIBINSTdir)
-+
-
- confclean: $(CLEANdep)
- rm -f *core* *.o config?.out
-Index: ATLAS/Make.top
-===================================================================
---- ATLAS.orig/Make.top 2013-01-09 17:42:07.000000000 +0100
-+++ ATLAS/Make.top 2013-01-09 17:42:07.000000000 +0100
-@@ -655,6 +655,7 @@
- touch include/dXover.h
- touch include/sXover.h
-
-+# XXX: we should use install tool here instead of those hacks
- install_inc:
- cp $(INCSdir)/cblas.h $(INSTdir)/.
- cp $(INCSdir)/clapack.h $(INSTdir)/.
-@@ -686,10 +687,18 @@
-
- install_shared_lib:
- for lib in atlas cblas f77blas lapack_atlas; do \
-- cp $(LIBdir)/lib$$lib.so $(INSTdir)/. ; \
-+ 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.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.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.3 ;\
-+ chmod 0644 $(INSTdir)/atlas/lib$$lib.so.3.0 ;\
- done;
-Index: ATLAS/makes/Make.lib
-===================================================================
---- ATLAS.orig/makes/Make.lib 2013-01-09 17:42:06.000000000 +0100
-+++ ATLAS/makes/Make.lib 2013-01-09 17:42:07.000000000 +0100
-@@ -2,12 +2,12 @@
- LD = ld
- mySRCdir = $(SRCdir)/lib
- #
--# override with libatlas.so 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.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.10.1
- 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
-+ 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)
-+
-+
-+
- # ===================================================================
- # 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
-+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
-@@ -207,22 +260,22 @@
- # Builds one shared lib from all ATLAS files
- #
- fat_ptshared : # threaded target
-- $(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 : 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)"
-
-@@ -327,12 +380,12 @@
- -Wl,--rpath ./
-
- xtry_lp:
-- $(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 libsatlas.so \
-+ $(ICC) $(CDEFS) -o $@ $(mySRCdir)/test_dynlink.c libsatlas.so.3.0 \
- -Wl,--rpath ./
- xtry_pt :
-- $(ICC) $(CDEFS) -o $@ $(mySRCdir)/test_dynlink.c libtatlas.so \
-+ $(ICC) $(CDEFS) -o $@ $(mySRCdir)/test_dynlink.c libtatlas.so.3.0 \
- -Wl,--rpath ./
diff --git a/debian/patches/08_install_shared_lib_call.diff b/debian/patches/08_install_shared_lib_call.diff
deleted file mode 100644
index c0e1e6e..0000000
--- a/debian/patches/08_install_shared_lib_call.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: ATLAS/CONFIG/src/Makefile
-===================================================================
---- ATLAS.orig/CONFIG/src/Makefile 2013-01-09 17:42:07.000000000 +0100
-+++ ATLAS/CONFIG/src/Makefile 2013-01-09 17:42:08.000000000 +0100
-@@ -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)
-+ $(MAKE) -f Make.top install_shared_lib INSTdir=$(LIBINSTdir)
- install_headers : $(INCINSTdir) $(INCINSTdir)/atlas
- $(MAKE) -f Make.top install_inc INSTdir=$(INCINSTdir)
- install_static : $(LIBINSTdir) $(LIBINSTdir)/atlas
diff --git a/debian/patches/09_mkdir_inst_dir.diff b/debian/patches/09_mkdir_inst_dir.diff
deleted file mode 100644
index 3a2fa23..0000000
--- a/debian/patches/09_mkdir_inst_dir.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: ATLAS/Make.top
-===================================================================
---- ATLAS.orig/Make.top 2013-01-09 17:42:07.000000000 +0100
-+++ ATLAS/Make.top 2013-01-09 17:42:09.000000000 +0100
-@@ -664,6 +664,7 @@
- - chmod 0644 $(INSTdir)/atlas/*
-
- install_static_lib:
-+ mkdir -p $(INSTdir)/atlas
- cp $(LIBdir)/libatlas.a $(INSTdir)/.
- cp $(LIBdir)/libcblas.a $(INSTdir)/.
- cp $(LIBdir)/liblapack_atlas.a $(INSTdir)/.
-@@ -686,6 +687,7 @@
- - cp $(LIBdir)/libtatlas.so $(INSTdir)/.
-
- install_shared_lib:
-+ mkdir -p $(INSTdir)/atlas
- for lib in atlas cblas f77blas lapack_atlas; do \
- cp $(LIBdir)/lib$$lib.so.3.0 $(INSTdir)/. ; \
- ( cd $(INSTdir) && ln -s lib$$lib.so.3.0 lib$$lib.so.3); \
diff --git a/debian/patches/series b/debian/patches/series
index a258485..c9fe869 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,11 +1,6 @@
02_rename_lapack_atlas.diff
-03_full_blas_lapack.diff
-04_static_install_target.diff
-05_shared_full_blas.diff
-06_install_shared.diff
-07_full_sonames.diff
-08_install_shared_lib_call.diff
-09_mkdir_inst_dir.diff
+static_full_blas_lapack.diff
+shared_libraries.diff
10_s390.diff
16_warning-removed.diff
17_hppa.diff
diff --git a/debian/patches/shared_libraries.diff b/debian/patches/shared_libraries.diff
new file mode 100644
index 0000000..2df7ef9
--- /dev/null
+++ b/debian/patches/shared_libraries.diff
@@ -0,0 +1,123 @@
+Description: Create shared versions of the libraries
+Author: David Evans
+Last-Update: 2013-06-05
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/makes/Make.lib
++++ b/makes/Make.lib
+@@ -33,6 +33,73 @@
+ rm -rf $(ARCH)
+ $(BZIP) --best $(tarnam).tar
+
++fullshared: libatlas.so libcblas.so libf77blas.so liblapack_atlas.so atlas/libblas.so atlas/liblapack.so
++
++libatlas.so: libatlas.so.3
++ ln -sf $< $@
++
++libatlas.so.3: libatlas.so.3.0
++ ln -sf $< $@
++
++libatlas.so.3.0 : libatlas.a
++ ld $(LDFLAGS) -shared -soname libatlas.so.3 -o $@ \
++ --whole-archive libatlas.a --no-whole-archive -lc $(LIBS) $(F77SYSLIB)
++
++libcblas.so: libcblas.so.3
++ ln -sf $< $@
++
++libcblas.so.3: libcblas.so.3.0
++ ln -sf $< $@
++
++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
++
++libf77blas.so: libf77blas.so.3
++ ln -sf $< $@
++
++libf77blas.so.3: libf77blas.so.3.0
++ ln -sf $< $@
++
++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
++
++liblapack_atlas.so: liblapack_atlas.so.3
++ ln -sf $< $@
++
++liblapack_atlas.so.3: liblapack_atlas.so.3.0
++ ln -sf $< $@
++
++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 -lc $(F77SYSLIB)
++
++atlas/libblas.so: atlas/libblas.so.3
++ (cd atlas && ln -sf libblas.so.3 libblas.so)
++
++atlas/libblas.so.3: atlas/libblas.so.3.0
++ (cd atlas && ln -sf libblas.so.3.0 libblas.so.3)
++
++atlas/libblas.so.3.0: atlas/libblas.a libatlas.so.3.0
++ ld $(LDFLAGS) -shared -soname libblas.so.3 -o $@ \
++ --whole-archive atlas/libblas.a \
++ --no-whole-archive $(F77SYSLIB) -lm -lc
++
++atlas/liblapack.so: atlas/liblapack.so.3
++ (cd atlas && ln -sf liblapack.so.3 liblapack.so)
++
++atlas/liblapack.so.3: atlas/liblapack.so.3.0
++ (cd atlas && ln -sf liblapack.so.3.0 liblapack.so.3)
++
++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
++
+ # ===================================================================
+ # The following commands are to build dynamic/shared objects on Linux
+ # using the gnu gcc or ld
+--- a/Make.top
++++ b/Make.top
+@@ -16,6 +16,7 @@
+ cd bin/ ; ./xatlas_build $(INSTFLAGS)
+ cd lib/ ; $(MAKE) atlas/libblas.a
+ cd lib/ ; $(MAKE) atlas/liblapack.a
++ cd lib/ ; $(MAKE) fullshared
+
+ time:
+ ./xatlbench -dc $(BLDdir)/bin/INSTALL_LOG -dp $(BLDdir)/ARCHS/$(ARCH)
+@@ -683,3 +684,21 @@
+ - cp $(LIBdir)/libsatlas.so $(INSTdir)/.
+ - cp $(LIBdir)/libtatlas.so $(INSTdir)/.
+
++install_shared_lib:
++ for lib in atlas cblas f77blas lapack_atlas; do \
++ 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.3 ;\
++ chmod 0644 $(INSTdir)/lib$$lib.so.3.0 ;\
++ done;
++ mkdir -p $(INSTdir)/atlas
++ for lib in blas lapack; do \
++ 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.3 ;\
++ chmod 0644 $(INSTdir)/atlas/lib$$lib.so.3.0 ;\
++ done;
+--- a/CONFIG/src/Makefile
++++ b/CONFIG/src/Makefile
+@@ -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)
++ $(MAKE) -f Make.top install_shared_lib INSTdir=$(LIBINSTdir)
+
+ confclean: $(CLEANdep)
+ rm -f *core* *.o config?.out
diff --git a/debian/patches/04_static_install_target.diff b/debian/patches/static_full_blas_lapack.diff
similarity index 54%
rename from debian/patches/04_static_install_target.diff
rename to debian/patches/static_full_blas_lapack.diff
index 4e1921d..3274cfa 100644
--- a/debian/patches/04_static_install_target.diff
+++ b/debian/patches/static_full_blas_lapack.diff
@@ -1,54 +1,37 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_static_install_target.dpatch by <david at evans>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-Index: ATLAS/CONFIG/src/Makefile
-===================================================================
---- ATLAS.orig/CONFIG/src/Makefile 2013-01-08 19:15:42.000000000 +0100
-+++ ATLAS/CONFIG/src/Makefile 2013-01-09 17:42:06.000000000 +0100
-@@ -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: $(CLEANdep)
- rm -f *core* *.o config?.out
-Index: ATLAS/CONFIG/src/SpewMakeInc.c
-===================================================================
---- ATLAS.orig/CONFIG/src/SpewMakeInc.c 2013-01-09 17:41:59.000000000 +0100
-+++ ATLAS/CONFIG/src/SpewMakeInc.c 2013-01-09 17:42:06.000000000 +0100
-@@ -604,6 +604,9 @@
- }
- fprintf(fpout, " TESTlib = $(LIBdir)/libtstatlas.a\n\n");
-
-+ fprintf(fpout, " FULLBLASlib = $(LIBdir)/atlas/libblas.a\n");
-+ fprintf(fpout, " FULLLAPACKlib = $(LIBdir)/atlas/liblapack.a\n");
-+
- fprintf(fpout, "# -------------------------------------------\n");
- fprintf(fpout, "# Upper bound on largest cache size, in bytes\n");
- fprintf(fpout, "# -------------------------------------------\n");
-Index: ATLAS/Make.top
-===================================================================
---- ATLAS.orig/Make.top 2013-01-09 17:42:05.000000000 +0100
-+++ ATLAS/Make.top 2013-01-09 17:42:06.000000000 +0100
-@@ -14,6 +14,11 @@
+Description: Create full featured static libblas.a and liblapack.a
+Author: David Evans
+Last-Update: 2013-06-05
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/Make.top
++++ b/Make.top
+@@ -14,6 +14,9 @@
build:
cd bin/ ; $(MAKE) xatlas_build
cd bin/ ; ./xatlas_build $(INSTFLAGS)
+ cd lib/ ; $(MAKE) atlas/libblas.a
+ cd lib/ ; $(MAKE) atlas/liblapack.a
-+ cd lib/ ; $(MAKE) shared
-+ cd lib/ ; $(MAKE) fullshared
+
time:
./xatlbench -dc $(BLDdir)/bin/INSTALL_LOG -dp $(BLDdir)/ARCHS/$(ARCH)
C_sanity_test:
-@@ -656,12 +661,16 @@
+@@ -401,6 +404,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/threads ; touch atomic.inc
+@@ -591,6 +595,7 @@
+
+ lib :
+ mkdir lib
++ mkdir lib/atlas
+
+ include:
+ mkdir include
+@@ -654,12 +659,17 @@
chmod 0644 $(INSTdir)/cblas.h $(INSTdir)/clapack.h
cp $(INCAdir)/* $(INSTdir)/atlas/.
- chmod 0644 $(INSTdir)/atlas/*
@@ -58,6 +41,7 @@ Index: ATLAS/Make.top
cp $(LIBdir)/libatlas.a $(INSTdir)/.
cp $(LIBdir)/libcblas.a $(INSTdir)/.
cp $(LIBdir)/liblapack_atlas.a $(INSTdir)/.
++ mkdir -p $(INSTdir)/atlas
+ cp $(LIBdir)/atlas/libblas.a $(INSTdir)/atlas/.
+ cp $(LIBdir)/atlas/liblapack.a $(INSTdir)/atlas/.
chmod 0644 $(INSTdir)/libatlas.a $(INSTdir)/liblapack_atlas.a \
@@ -67,3 +51,54 @@ Index: ATLAS/Make.top
- cp $(LIBdir)/libf77blas.a $(INSTdir)/.
- chmod 0644 $(INSTdir)/libf77blas.a
- cp $(LIBdir)/libptcblas.a $(INSTdir)/.
+--- a/makes/Make.lib
++++ b/makes/Make.lib
+@@ -175,6 +175,25 @@
+ LIBS="$(LIBS)" LIBINSTdir="$(LIBINSTdir)" ; \
+ fi
+
++
++# Build full netlib blas/lapack libraries:
++atlas/libblas.a: libatlas.a libptf77blas.a libptcblas.a
++ mkdir tmp
++ (cd tmp && ar x ../libatlas.a);
++ (cd tmp && ar x ../libptf77blas.a);
++ (cd tmp && ar x ../libptcblas.a);
++ ar r $@ tmp/*.o
++ rm -rf tmp
++
++atlas/liblapack.a: liblapack_atlas.a libatlas.a
++ mkdir tmp
++ (cd tmp && ar x /usr/lib/liblapack_pic.a);
++ (cd tmp && ar x ../liblapack_atlas.a);
++ (cd tmp && ar x ../libptcblas.a);
++ ar r $@ tmp/*.o
++ rm -rf tmp
++
++
+ #
+ # Builds one shared lib from all ATLAS files
+ #
+--- a/CONFIG/src/Makefile
++++ b/CONFIG/src/Makefile
+@@ -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: $(CLEANdep)
+ rm -f *core* *.o config?.out
+--- a/CONFIG/src/SpewMakeInc.c
++++ b/CONFIG/src/SpewMakeInc.c
+@@ -604,6 +604,9 @@
+ }
+ fprintf(fpout, " TESTlib = $(LIBdir)/libtstatlas.a\n\n");
+
++ fprintf(fpout, " FULLBLASlib = $(LIBdir)/atlas/libblas.a\n");
++ fprintf(fpout, " FULLLAPACKlib = $(LIBdir)/atlas/liblapack.a\n");
++
+ fprintf(fpout, "# -------------------------------------------\n");
+ fprintf(fpout, "# Upper bound on largest cache size, in bytes\n");
+ fprintf(fpout, "# -------------------------------------------\n");
diff --git a/debian/rules b/debian/rules
index c85e09a..ce3989d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -132,10 +132,6 @@ build-arch-stamp: configure-stamp
targetName=`echo $(ARCHS)|sed -e "s|\(.*\)_.*_.*|atlas-\1|g"`; \
cd build/$$targetName; \
$(MAKE) build; \
- cd lib; \
- $(MAKE) shared; \
- $(MAKE) ptshared; \
- cd ..; \
$(MAKE) check; \
$(MAKE) ptcheck; \
echo "=============================================="; \
--
ATLAS packaging for Debian
More information about the debian-science-commits
mailing list