From f2192843d4f11c6a6bde2f8df89e10d6d8b757e5 Mon Sep 17 00:00:00 2001 From: Debian Science Team Date: Wed, 16 Aug 2017 21:30:36 +0100 Subject: [PATCH] rename-lapack-atlas Gbp-Pq: Name rename-lapack-atlas.patch --- CONFIG/src/SpewMakeInc.c | 2 +- Make.top | 4 ++-- makes/Make.lib | 24 ++++++++++++------------ 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/CONFIG/src/SpewMakeInc.c b/CONFIG/src/SpewMakeInc.c index fb19c0d..5b0e429 100644 --- a/CONFIG/src/SpewMakeInc.c +++ b/CONFIG/src/SpewMakeInc.c @@ -615,7 +615,7 @@ int main(int nargs, char **args) 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"); if (THREADS) { fprintf(fpout, " PTCBLASlib = $(LIBdir)/libptcblas.a\n"); diff --git a/Make.top b/Make.top index 8434537..43e45d7 100644 --- a/Make.top +++ b/Make.top @@ -657,8 +657,8 @@ install_inc: install_lib: cp $(LIBdir)/libatlas.a $(INSTdir)/. cp $(LIBdir)/libcblas.a $(INSTdir)/. - cp $(LIBdir)/liblapack.a $(INSTdir)/. - chmod 0644 $(INSTdir)/libatlas.a $(INSTdir)/liblapack.a \ + cp $(LIBdir)/liblapack_atlas.a $(INSTdir)/. + chmod 0644 $(INSTdir)/libatlas.a $(INSTdir)/liblapack_atlas.a \ $(INSTdir)/libcblas.a - cp $(LIBdir)/libf77blas.a $(INSTdir)/. - chmod 0644 $(INSTdir)/libf77blas.a diff --git a/makes/Make.lib b/makes/Make.lib index 4ceff02..a2ea495 100644 --- a/makes/Make.lib +++ b/makes/Make.lib @@ -4,10 +4,10 @@ mySRCdir = $(SRCdir)/lib # # override with libatlas.so only when atlas is built to one lib # -DYNlibs = liblapack.so libf77blas.so libcblas.so libatlas.so -PTDYNlibs = liblapack.so libptf77blas.so libptcblas.so libatlas.so -CDYNlibs = liblapack.so libcblas.so libatlas.so -CPTDYNlibs = liblapack.so libptcblas.so libatlas.so +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 VER=3.10.3 tmpd = RCW_tMp @@ -26,7 +26,7 @@ $(tarnam).tar.bz2 : cp $(LIBdir)/libatlas.a $(ARCH)/lib/. cp $(LIBdir)/libf77blas.a $(ARCH)/lib/. cp $(LIBdir)/libcblas.a $(ARCH)/lib/. - cp $(LIBdir)/liblapack.a $(ARCH)/lib/. + cp $(LIBdir)/liblapack_atlas.a $(ARCH)/lib/. - cp $(LIBdir)/libptcblas.a $(ARCH)/lib/. - cp $(LIBdir)/libptf77blas.a $(ARCH)/lib/. $(TAR) cf $(tarnam).tar $(ARCH) @@ -184,7 +184,7 @@ fat_ptshared : # threaded target 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 @@ -198,10 +198,10 @@ fat_cshared : libclapack.a # unthreaded target libas="libclapack.a libcblas.a libatlas.a" \ LIBINSTdir="$(LIBINSTdir)" -libclapack.a : liblapack.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* clapack/*C2F* ar r libclapack.a clapack/ATL_* clapack/clapack_* rm -rf clapack @@ -229,7 +229,7 @@ tdlls: # threaded target 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 @@ csdlls: libclapack.a # serial target # ======================================================================= 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 @@ ptcdylib : libptclapack.a -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 \ -- 2.30.2