[atlas] 05/08: Refresh other patches.
Sébastien Villemot
sebastien at debian.org
Sat Jul 12 15:33:21 UTC 2014
This is an automated email from the git hooks/post-receive script.
sebastien pushed a commit to branch master
in repository atlas.
commit 415bc5b8fa735242d8962e891533c301a3ef269a
Author: Sébastien Villemot <sebastien at debian.org>
Date: Sat Jul 12 12:50:39 2014 +0200
Refresh other patches.
---
debian/patches/02_rename_lapack_atlas.diff | 38 +++++++++++++-----------------
debian/patches/10_s390.diff | 18 ++++++--------
debian/patches/17_hppa.diff | 6 ++---
debian/patches/18_alpha.diff | 6 ++---
debian/patches/20_armel.diff | 6 ++---
debian/patches/21_mips2.diff | 4 ++--
debian/patches/22_sh.diff | 6 ++---
debian/patches/armhf.diff | 2 +-
debian/patches/generic.diff | 22 ++++++++---------
9 files changed, 49 insertions(+), 59 deletions(-)
diff --git a/debian/patches/02_rename_lapack_atlas.diff b/debian/patches/02_rename_lapack_atlas.diff
index a7c9b16..dfa6a6c 100644
--- a/debian/patches/02_rename_lapack_atlas.diff
+++ b/debian/patches/02_rename_lapack_atlas.diff
@@ -5,11 +5,9 @@
## DP: Rename ATLAS incomplete lapack to lapack_atlas.
@DPATCH@
-Index: ATLAS/CONFIG/src/SpewMakeInc.c
-===================================================================
---- ATLAS.orig/CONFIG/src/SpewMakeInc.c 2013-01-08 19:15:42.000000000 +0100
-+++ ATLAS/CONFIG/src/SpewMakeInc.c 2013-01-09 17:41:59.000000000 +0100
-@@ -595,7 +595,7 @@
+--- a/CONFIG/src/SpewMakeInc.c
++++ b/CONFIG/src/SpewMakeInc.c
+@@ -595,7 +595,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");
@@ -18,11 +16,9 @@ Index: ATLAS/CONFIG/src/SpewMakeInc.c
if (THREADS)
{
fprintf(fpout, " PTCBLASlib = $(LIBdir)/libptcblas.a\n");
-Index: ATLAS/Make.top
-===================================================================
---- ATLAS.orig/Make.top 2013-01-08 19:15:40.000000000 +0100
-+++ ATLAS/Make.top 2013-01-09 17:41:59.000000000 +0100
-@@ -657,8 +657,8 @@
+--- a/Make.top
++++ b/Make.top
+@@ -657,8 +657,8 @@ install_inc:
install_lib:
cp $(LIBdir)/libatlas.a $(INSTdir)/.
cp $(LIBdir)/libcblas.a $(INSTdir)/.
@@ -33,11 +29,9 @@ Index: ATLAS/Make.top
$(INSTdir)/libcblas.a
- cp $(LIBdir)/libf77blas.a $(INSTdir)/.
- chmod 0644 $(INSTdir)/libf77blas.a
-Index: ATLAS/makes/Make.lib
-===================================================================
---- ATLAS.orig/makes/Make.lib 2013-01-08 19:15:41.000000000 +0100
-+++ ATLAS/makes/Make.lib 2013-01-09 17:41:59.000000000 +0100
-@@ -4,10 +4,10 @@
+--- 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
#
@@ -50,9 +44,9 @@ Index: ATLAS/makes/Make.lib
+CDYNlibs = liblapack_atlas.so libcblas.so libatlas.so
+CPTDYNlibs = liblapack_atlas.so libptcblas.so libatlas.so
- VER=3.10.1
+ VER=3.10.2
tmpd = RCW_tMp
-@@ -26,7 +26,7 @@
+@@ -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/.
@@ -61,7 +55,7 @@ Index: ATLAS/makes/Make.lib
- cp $(LIBdir)/libptcblas.a $(ARCH)/lib/.
- cp $(LIBdir)/libptf77blas.a $(ARCH)/lib/.
$(TAR) cf $(tarnam).tar $(ARCH)
-@@ -184,7 +184,7 @@
+@@ -184,7 +184,7 @@ fat_ptshared :
LIBINSTdir="$(LIBINSTdir)"
fat_shared : # serial target
$(MAKE) TRYALL outso=libsatlas.so \
@@ -70,7 +64,7 @@ Index: ATLAS/makes/Make.lib
LIBINSTdir="$(LIBINSTdir)"
#
# Builds shared lib, not include fortran codes from LAPACK
-@@ -198,10 +198,10 @@
+@@ -198,10 +198,10 @@ fat_cshared : libclapack.a
libas="libclapack.a libcblas.a libatlas.a" \
LIBINSTdir="$(LIBINSTdir)"
@@ -83,7 +77,7 @@ Index: ATLAS/makes/Make.lib
rm -f clapack/*f77wrap* clapack/*C2F*
ar r libclapack.a clapack/ATL_* clapack/clapack_*
rm -rf clapack
-@@ -229,7 +229,7 @@
+@@ -229,7 +229,7 @@ tdlls: # thread
LIBINSTdir="$(LIBINSTdir)"
sdlls: # serial target
$(MAKE) TRYALL_WIN outso=libsatlas.dll outdef=libsatlas.def \
@@ -92,7 +86,7 @@ Index: ATLAS/makes/Make.lib
LIBINSTdir="$(LIBINSTdir)"
cdlls: ctdlls csdlls
ctdlls: libptclapack.a # threaded target
-@@ -246,7 +246,7 @@
+@@ -246,7 +246,7 @@ csdlls: libclapack.a # serial
# =======================================================================
dylib :
rm -rf $(tmpd) ; mkdir $(tmpd)
@@ -101,7 +95,7 @@ Index: ATLAS/makes/Make.lib
cd $(tmpd) ; ar x ../libf77blas.a
cd $(tmpd) ; ar x ../libcblas.a
cd $(tmpd) ; ar x ../libatlas.a
-@@ -283,9 +283,9 @@
+@@ -283,9 +283,9 @@ ptcdylib : libptclapack.a
-compatibility_version $(VER) *.o $(LIBS)
rm -rf $(tmpd)
diff --git a/debian/patches/10_s390.diff b/debian/patches/10_s390.diff
index 03fa132..9d73afc 100644
--- a/debian/patches/10_s390.diff
+++ b/debian/patches/10_s390.diff
@@ -1,8 +1,6 @@
-Index: atlas/CONFIG/src/SpewMakeInc.c
-===================================================================
---- atlas.orig/CONFIG/src/SpewMakeInc.c 2013-06-06 06:31:19.000000000 +0000
-+++ atlas/CONFIG/src/SpewMakeInc.c 2013-06-06 06:31:52.000000000 +0000
-@@ -394,7 +394,7 @@
+--- a/CONFIG/src/SpewMakeInc.c
++++ b/CONFIG/src/SpewMakeInc.c
+@@ -394,7 +394,7 @@ char *GetPtrbitsFlag(enum OSTYPE OS, enu
if (MachIsMIPS(arch))
return((ptrbits == 64) ? "-mabi=64" : "-mabi=n32");
if (MachIsS390(arch))
@@ -11,7 +9,7 @@ Index: atlas/CONFIG/src/SpewMakeInc.c
if (!CompIsGcc(comp))
{
/*
-@@ -774,8 +774,6 @@
+@@ -774,8 +774,6 @@ int main(int nargs, char **args)
fprintf(fpout, "_fbsd");
}
}
@@ -20,11 +18,9 @@ Index: atlas/CONFIG/src/SpewMakeInc.c
fprintf(fpout, "\n F77SYSLIB = %s\n", f77lib ? f77lib : "");
fprintf(fpout, " BC = $(KC)\n");
fprintf(fpout, " NCFLAGS = $(KCFLAGS)\n");
-Index: atlas/CONFIG/src/probe_comp.c
-===================================================================
---- atlas.orig/CONFIG/src/probe_comp.c 2013-06-06 06:31:19.000000000 +0000
-+++ atlas/CONFIG/src/probe_comp.c 2013-06-06 06:34:15.000000000 +0000
-@@ -583,7 +583,7 @@
+--- a/CONFIG/src/probe_comp.c
++++ b/CONFIG/src/probe_comp.c
+@@ -587,7 +587,7 @@ char *GetPtrbitsFlag(enum OSTYPE OS, enu
if (MachIsMIPS(arch))
return((ptrbits == 64) ? "-mabi=64" : "-mabi=n32");
if (MachIsS390(arch))
diff --git a/debian/patches/17_hppa.diff b/debian/patches/17_hppa.diff
index 388e554..613d015 100644
--- a/debian/patches/17_hppa.diff
+++ b/debian/patches/17_hppa.diff
@@ -1,6 +1,6 @@
--- a/CONFIG/include/atlconf.h
+++ b/CONFIG/include/atlconf.h
-@@ -62,7 +62,13 @@
+@@ -63,7 +63,13 @@ enum MACHTYPE {MACHOther, IbmPwr3, IbmPw
( (mach_) == ARMv7 )
#define MachIsS390(mach_) \
( (mach_) >= IbmZ9 && (mach_) <= IbmZ196 )
@@ -17,7 +17,7 @@
static char *f2c_intstr[5] =
--- a/CONFIG/src/SpewMakeInc.c
+++ b/CONFIG/src/SpewMakeInc.c
-@@ -391,6 +391,8 @@
+@@ -391,6 +391,8 @@ char *GetPtrbitsFlag(enum OSTYPE OS, enu
if (MachIsIA64(arch))
return(sp);
@@ -28,7 +28,7 @@
if (MachIsS390(arch))
--- a/CONFIG/src/probe_comp.c
+++ b/CONFIG/src/probe_comp.c
-@@ -580,6 +580,8 @@
+@@ -584,6 +584,8 @@ char *GetPtrbitsFlag(enum OSTYPE OS, enu
if (MachIsIA64(arch))
return(sp);
diff --git a/debian/patches/18_alpha.diff b/debian/patches/18_alpha.diff
index a514271..ebdb9d7 100644
--- a/debian/patches/18_alpha.diff
+++ b/debian/patches/18_alpha.diff
@@ -1,6 +1,6 @@
--- a/CONFIG/include/atlconf.h
+++ b/CONFIG/include/atlconf.h
-@@ -69,6 +69,13 @@
+@@ -70,6 +70,13 @@ enum MACHTYPE {MACHOther, IbmPwr3, IbmPw
#define MachIsHPPA(mach_) \
( 0 )
#endif
@@ -16,7 +16,7 @@
static char *f2c_intstr[5] =
--- a/CONFIG/src/SpewMakeInc.c
+++ b/CONFIG/src/SpewMakeInc.c
-@@ -393,6 +393,8 @@
+@@ -393,6 +393,8 @@ char *GetPtrbitsFlag(enum OSTYPE OS, enu
return(sp);
if (MachIsHPPA(arch))
return(sp);
@@ -27,7 +27,7 @@
if (MachIsS390(arch))
--- a/CONFIG/src/probe_comp.c
+++ b/CONFIG/src/probe_comp.c
-@@ -582,6 +582,8 @@
+@@ -586,6 +586,8 @@ char *GetPtrbitsFlag(enum OSTYPE OS, enu
return(sp);
if (MachIsHPPA(arch))
return(sp);
diff --git a/debian/patches/20_armel.diff b/debian/patches/20_armel.diff
index 63ba3be..e0f5d64 100644
--- a/debian/patches/20_armel.diff
+++ b/debian/patches/20_armel.diff
@@ -1,6 +1,6 @@
--- a/CONFIG/include/atlconf.h
+++ b/CONFIG/include/atlconf.h
-@@ -76,6 +76,14 @@
+@@ -77,6 +77,14 @@ enum MACHTYPE {MACHOther, IbmPwr3, IbmPw
#define MachIsALPHA(mach_) \
( 0 )
#endif
@@ -17,7 +17,7 @@
static char *f2c_intstr[5] =
--- a/CONFIG/src/SpewMakeInc.c
+++ b/CONFIG/src/SpewMakeInc.c
-@@ -395,6 +395,8 @@
+@@ -395,6 +395,8 @@ char *GetPtrbitsFlag(enum OSTYPE OS, enu
return(sp);
if (MachIsALPHA(arch))
return(sp);
@@ -28,7 +28,7 @@
if (MachIsS390(arch))
--- a/CONFIG/src/probe_comp.c
+++ b/CONFIG/src/probe_comp.c
-@@ -584,6 +584,8 @@
+@@ -588,6 +588,8 @@ char *GetPtrbitsFlag(enum OSTYPE OS, enu
return(sp);
if (MachIsALPHA(arch))
return(sp);
diff --git a/debian/patches/21_mips2.diff b/debian/patches/21_mips2.diff
index 8e1e53e..ba7dcab 100644
--- a/debian/patches/21_mips2.diff
+++ b/debian/patches/21_mips2.diff
@@ -1,6 +1,6 @@
--- a/CONFIG/src/SpewMakeInc.c
+++ b/CONFIG/src/SpewMakeInc.c
-@@ -398,7 +398,7 @@
+@@ -398,7 +398,7 @@ char *GetPtrbitsFlag(enum OSTYPE OS, enu
if (MachIsARMEL(arch))
return(sp);
if (MachIsMIPS(arch))
@@ -11,7 +11,7 @@
if (!CompIsGcc(comp))
--- a/CONFIG/src/probe_comp.c
+++ b/CONFIG/src/probe_comp.c
-@@ -587,7 +587,7 @@
+@@ -591,7 +591,7 @@ char *GetPtrbitsFlag(enum OSTYPE OS, enu
if (MachIsARMEL(arch))
return(sp);
if (MachIsMIPS(arch))
diff --git a/debian/patches/22_sh.diff b/debian/patches/22_sh.diff
index f040e20..6661e85 100644
--- a/debian/patches/22_sh.diff
+++ b/debian/patches/22_sh.diff
@@ -1,6 +1,6 @@
--- a/CONFIG/include/atlconf.h
+++ b/CONFIG/include/atlconf.h
-@@ -84,6 +84,14 @@
+@@ -85,6 +85,14 @@ enum MACHTYPE {MACHOther, IbmPwr3, IbmPw
( 0 )
#endif
@@ -17,7 +17,7 @@
static char *f2c_intstr[5] =
--- a/CONFIG/src/SpewMakeInc.c
+++ b/CONFIG/src/SpewMakeInc.c
-@@ -399,6 +399,8 @@
+@@ -399,6 +399,8 @@ char *GetPtrbitsFlag(enum OSTYPE OS, enu
return(sp);
if (MachIsMIPS(arch))
return(sp);
@@ -28,7 +28,7 @@
if (!CompIsGcc(comp))
--- a/CONFIG/src/probe_comp.c
+++ b/CONFIG/src/probe_comp.c
-@@ -590,6 +590,8 @@
+@@ -594,6 +594,8 @@ char *GetPtrbitsFlag(enum OSTYPE OS, enu
return(sp);
if (MachIsS390(arch))
return(sp);
diff --git a/debian/patches/armhf.diff b/debian/patches/armhf.diff
index 4c15ded..2f8ac21 100644
--- a/debian/patches/armhf.diff
+++ b/debian/patches/armhf.diff
@@ -8,7 +8,7 @@ Last-Update: 2013-06-09
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/CONFIG/src/atlcomp.txt
+++ b/CONFIG/src/atlcomp.txt
-@@ -255,13 +255,13 @@
+@@ -259,13 +259,13 @@ MACH=P4,PM OS=WinNT,Win64 LVL=0 COMPS=ic
# ARM defaults
#
MACH=ARMv7 OS=ALL LVL=1000 COMPS=xcc
diff --git a/debian/patches/generic.diff b/debian/patches/generic.diff
index 5b7dbb5..c535ce7 100644
--- a/debian/patches/generic.diff
+++ b/debian/patches/generic.diff
@@ -6,7 +6,7 @@ Description: Add a GENERIC machine type
with ARMv7 CPU, ATLAS would detect ARMv7 if provided the UNKNOWN type.
Author: Sébastien Villemot <sebastien at debian.org>
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=719355
-Last-Update: 2014-01-29
+Last-Update: 2014-07-12
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/CONFIG/include/atlconf.h
@@ -15,22 +15,22 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
enum ARCHFAM {AFOther=0, AFPPC, AFSPARC, AFALPHA, AFX86, AFIA64, AFMIPS,
AFARM, AFS390};
--#define NMACH 47
-+#define NMACH 48
+-#define NMACH 52
++#define NMACH 53
static char *machnam[NMACH] =
{"UNKNOWN", "POWER3", "POWER4", "POWER5", "PPCG4", "PPCG5",
- "POWER6", "POWER7", "IBMz9", "IBMz10", "IBMz196",
-@@ -28,7 +28,7 @@ static char *machnam[NMACH] =
- "Efficeon", "K7", "HAMMER", "AMD64K10h", "AMDDOZER", "UNKNOWNx86",
- "IA64Itan", "IA64Itan2",
- "USI", "USII", "USIII", "USIV", "UST2", "UnknownUS",
+ "POWER6", "POWER7", "POWERe6500", "IBMz9", "IBMz10", "IBMz196",
+@@ -29,7 +29,7 @@ static char *machnam[NMACH] =
+ "Efficeon", "K7", "HAMMER", "AMD64K10h", "AMDLLANO", "AMDDOZER","AMDDRIVER",
+ "UNKNOWNx86", "IA64Itan", "IA64Itan2",
+ "USI", "USII", "USIII", "USIV", "UST1", "UST2", "UnknownUS",
- "MIPSR1xK", "MIPSICE9", "ARMv7"};
+ "MIPSR1xK", "MIPSICE9", "ARMv7", "GENERIC"};
enum MACHTYPE {MACHOther, IbmPwr3, IbmPwr4, IbmPwr5, PPCG4, PPCG5,
- IbmPwr6, IbmPwr7,
+ IbmPwr6, IbmPwr7, Pwre6500,
IbmZ9, IbmZ10, IbmZ196, /* s390(x) in Linux */
-@@ -41,7 +41,8 @@ enum MACHTYPE {MACHOther, IbmPwr3, IbmPw
- SunUSI, SunUSII, SunUSIII, SunUSIV, SunUST2, SunUSX,
+@@ -42,7 +42,8 @@ enum MACHTYPE {MACHOther, IbmPwr3, IbmPw
+ SunUSI, SunUSII, SunUSIII, SunUSIV, SunUST1, SunUST2, SunUSX,
MIPSR1xK, /* includes R10K, R12K, R14K, R16K */
MIPSICE9, /* SiCortex ICE9 -- like MIPS5K */
- ARMv7 /* includes Cortex A8, A9 */
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/atlas.git
More information about the debian-science-commits
mailing list