[SCM] ATLAS packaging for Debian branch, master, updated. upstream/3.8.4-19-g038be8e
Sébastien Villemot
sebastien at debian.org
Thu Jun 6 08:12:27 UTC 2013
The following commit has been merged in the master branch:
commit 038be8e761519d7890e5c7598e07914b5e3ee0d3
Author: Sébastien Villemot <sebastien at debian.org>
Date: Thu Jun 6 10:10:05 2013 +0200
Modify patch for s390 so that -m64 is not passed to LDFLAGS on s390x
Also refresh some other patches, as a consequence of this change
diff --git a/debian/patches/10_s390.diff b/debian/patches/10_s390.diff
index 15f0767..03fa132 100644
--- a/debian/patches/10_s390.diff
+++ b/debian/patches/10_s390.diff
@@ -1,26 +1,35 @@
-Index: ATLAS/CONFIG/src/SpewMakeInc.c
+Index: atlas/CONFIG/src/SpewMakeInc.c
===================================================================
---- ATLAS.orig/CONFIG/src/SpewMakeInc.c 2013-01-09 17:42:06.000000000 +0100
-+++ ATLAS/CONFIG/src/SpewMakeInc.c 2013-01-09 17:42:10.000000000 +0100
-@@ -391,6 +391,8 @@
-
- if (MachIsIA64(arch))
- return(sp);
-+ if (MachIsS390(arch))
-+ return(sp);
+--- 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 @@
if (MachIsMIPS(arch))
return((ptrbits == 64) ? "-mabi=64" : "-mabi=n32");
if (MachIsS390(arch))
-Index: ATLAS/CONFIG/src/probe_comp.c
-===================================================================
---- ATLAS.orig/CONFIG/src/probe_comp.c 2013-01-08 19:15:42.000000000 +0100
-+++ ATLAS/CONFIG/src/probe_comp.c 2013-01-09 17:42:10.000000000 +0100
-@@ -580,6 +580,8 @@
-
- if (MachIsIA64(arch))
- return(sp);
-+ if (MachIsS390(arch))
+- return((ptrbits == 64) ? "-m64" : "-m31");
+ return(sp);
+ if (!CompIsGcc(comp))
+ {
+ /*
+@@ -774,8 +774,6 @@
+ fprintf(fpout, "_fbsd");
+ }
+ }
+- if (MachIsS390(mach))
+- fprintf(fpout, ptrbits == 32 ? "-m31" : "-m64");
+ 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 @@
if (MachIsMIPS(arch))
return((ptrbits == 64) ? "-mabi=64" : "-mabi=n32");
if (MachIsS390(arch))
+- return((ptrbits == 64) ? "-m64" : "-m31");
++ return(sp);
+ if (!CompIsGcc(comp))
+ {
+ /*
diff --git a/debian/patches/17_hppa.diff b/debian/patches/17_hppa.diff
index df26680..388e554 100644
--- a/debian/patches/17_hppa.diff
+++ b/debian/patches/17_hppa.diff
@@ -1,7 +1,5 @@
-Index: ATLAS/CONFIG/include/atlconf.h
-===================================================================
---- ATLAS.orig/CONFIG/include/atlconf.h 2013-01-08 19:15:42.000000000 +0100
-+++ ATLAS/CONFIG/include/atlconf.h 2013-01-09 17:42:12.000000000 +0100
+--- a/CONFIG/include/atlconf.h
++++ b/CONFIG/include/atlconf.h
@@ -62,7 +62,13 @@
( (mach_) == ARMv7 )
#define MachIsS390(mach_) \
@@ -17,26 +15,22 @@ Index: ATLAS/CONFIG/include/atlconf.h
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 2013-01-09 17:42:10.000000000 +0100
-+++ ATLAS/CONFIG/src/SpewMakeInc.c 2013-01-09 17:42:12.000000000 +0100
-@@ -393,6 +393,8 @@
- return(sp);
- if (MachIsS390(arch))
+--- a/CONFIG/src/SpewMakeInc.c
++++ b/CONFIG/src/SpewMakeInc.c
+@@ -391,6 +391,8 @@
+
+ if (MachIsIA64(arch))
return(sp);
+ if (MachIsHPPA(arch))
+ return(sp);
if (MachIsMIPS(arch))
return((ptrbits == 64) ? "-mabi=64" : "-mabi=n32");
if (MachIsS390(arch))
-Index: ATLAS/CONFIG/src/probe_comp.c
-===================================================================
---- ATLAS.orig/CONFIG/src/probe_comp.c 2013-01-09 17:42:10.000000000 +0100
-+++ ATLAS/CONFIG/src/probe_comp.c 2013-01-09 17:42:12.000000000 +0100
-@@ -582,6 +582,8 @@
- return(sp);
- if (MachIsS390(arch))
+--- a/CONFIG/src/probe_comp.c
++++ b/CONFIG/src/probe_comp.c
+@@ -580,6 +580,8 @@
+
+ if (MachIsIA64(arch))
return(sp);
+ if (MachIsHPPA(arch))
+ return(sp);
diff --git a/debian/patches/18_alpha.diff b/debian/patches/18_alpha.diff
index 420e42c..a514271 100644
--- a/debian/patches/18_alpha.diff
+++ b/debian/patches/18_alpha.diff
@@ -1,7 +1,5 @@
-Index: ATLAS/CONFIG/include/atlconf.h
-===================================================================
---- ATLAS.orig/CONFIG/include/atlconf.h 2013-01-09 17:42:12.000000000 +0100
-+++ ATLAS/CONFIG/include/atlconf.h 2013-01-09 17:42:13.000000000 +0100
+--- a/CONFIG/include/atlconf.h
++++ b/CONFIG/include/atlconf.h
@@ -69,6 +69,13 @@
#define MachIsHPPA(mach_) \
( 0 )
@@ -16,11 +14,9 @@ Index: ATLAS/CONFIG/include/atlconf.h
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 2013-01-09 17:42:12.000000000 +0100
-+++ ATLAS/CONFIG/src/SpewMakeInc.c 2013-01-09 17:42:13.000000000 +0100
-@@ -395,6 +395,8 @@
+--- a/CONFIG/src/SpewMakeInc.c
++++ b/CONFIG/src/SpewMakeInc.c
+@@ -393,6 +393,8 @@
return(sp);
if (MachIsHPPA(arch))
return(sp);
@@ -29,11 +25,9 @@ Index: ATLAS/CONFIG/src/SpewMakeInc.c
if (MachIsMIPS(arch))
return((ptrbits == 64) ? "-mabi=64" : "-mabi=n32");
if (MachIsS390(arch))
-Index: ATLAS/CONFIG/src/probe_comp.c
-===================================================================
---- ATLAS.orig/CONFIG/src/probe_comp.c 2013-01-09 17:42:12.000000000 +0100
-+++ ATLAS/CONFIG/src/probe_comp.c 2013-01-09 17:42:13.000000000 +0100
-@@ -584,6 +584,8 @@
+--- a/CONFIG/src/probe_comp.c
++++ b/CONFIG/src/probe_comp.c
+@@ -582,6 +582,8 @@
return(sp);
if (MachIsHPPA(arch))
return(sp);
diff --git a/debian/patches/20_armel.diff b/debian/patches/20_armel.diff
index 508d45e..63ba3be 100644
--- a/debian/patches/20_armel.diff
+++ b/debian/patches/20_armel.diff
@@ -1,7 +1,5 @@
-Index: ATLAS/CONFIG/include/atlconf.h
-===================================================================
---- ATLAS.orig/CONFIG/include/atlconf.h 2013-01-09 17:42:13.000000000 +0100
-+++ ATLAS/CONFIG/include/atlconf.h 2013-01-09 17:42:13.000000000 +0100
+--- a/CONFIG/include/atlconf.h
++++ b/CONFIG/include/atlconf.h
@@ -76,6 +76,14 @@
#define MachIsALPHA(mach_) \
( 0 )
@@ -17,11 +15,9 @@ Index: ATLAS/CONFIG/include/atlconf.h
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 2013-01-09 17:42:13.000000000 +0100
-+++ ATLAS/CONFIG/src/SpewMakeInc.c 2013-01-09 17:42:13.000000000 +0100
-@@ -397,6 +397,8 @@
+--- a/CONFIG/src/SpewMakeInc.c
++++ b/CONFIG/src/SpewMakeInc.c
+@@ -395,6 +395,8 @@
return(sp);
if (MachIsALPHA(arch))
return(sp);
@@ -30,11 +26,9 @@ Index: ATLAS/CONFIG/src/SpewMakeInc.c
if (MachIsMIPS(arch))
return((ptrbits == 64) ? "-mabi=64" : "-mabi=n32");
if (MachIsS390(arch))
-Index: ATLAS/CONFIG/src/probe_comp.c
-===================================================================
---- ATLAS.orig/CONFIG/src/probe_comp.c 2013-01-09 17:42:13.000000000 +0100
-+++ ATLAS/CONFIG/src/probe_comp.c 2013-01-09 17:42:13.000000000 +0100
-@@ -586,6 +586,8 @@
+--- a/CONFIG/src/probe_comp.c
++++ b/CONFIG/src/probe_comp.c
+@@ -584,6 +584,8 @@
return(sp);
if (MachIsALPHA(arch))
return(sp);
diff --git a/debian/patches/21_mips2.diff b/debian/patches/21_mips2.diff
index fc2b7c4..8e1e53e 100644
--- a/debian/patches/21_mips2.diff
+++ b/debian/patches/21_mips2.diff
@@ -1,26 +1,22 @@
-Index: ATLAS/CONFIG/src/SpewMakeInc.c
-===================================================================
---- ATLAS.orig/CONFIG/src/SpewMakeInc.c 2013-01-09 17:42:13.000000000 +0100
-+++ ATLAS/CONFIG/src/SpewMakeInc.c 2013-01-09 17:42:14.000000000 +0100
-@@ -400,7 +400,7 @@
+--- a/CONFIG/src/SpewMakeInc.c
++++ b/CONFIG/src/SpewMakeInc.c
+@@ -398,7 +398,7 @@
if (MachIsARMEL(arch))
return(sp);
if (MachIsMIPS(arch))
- return((ptrbits == 64) ? "-mabi=64" : "-mabi=n32");
+ return(sp);
if (MachIsS390(arch))
- return((ptrbits == 64) ? "-m64" : "-m31");
+ return(sp);
if (!CompIsGcc(comp))
-Index: ATLAS/CONFIG/src/probe_comp.c
-===================================================================
---- ATLAS.orig/CONFIG/src/probe_comp.c 2013-01-09 17:42:13.000000000 +0100
-+++ ATLAS/CONFIG/src/probe_comp.c 2013-01-09 17:42:14.000000000 +0100
-@@ -589,7 +589,7 @@
+--- a/CONFIG/src/probe_comp.c
++++ b/CONFIG/src/probe_comp.c
+@@ -587,7 +587,7 @@
if (MachIsARMEL(arch))
return(sp);
if (MachIsMIPS(arch))
- return((ptrbits == 64) ? "-mabi=64" : "-mabi=n32");
+ return(sp);
if (MachIsS390(arch))
- return((ptrbits == 64) ? "-m64" : "-m31");
+ return(sp);
if (!CompIsGcc(comp))
diff --git a/debian/patches/22_sh.diff b/debian/patches/22_sh.diff
index dad4ab4..f040e20 100644
--- a/debian/patches/22_sh.diff
+++ b/debian/patches/22_sh.diff
@@ -1,7 +1,5 @@
-Index: ATLAS/CONFIG/include/atlconf.h
-===================================================================
---- ATLAS.orig/CONFIG/include/atlconf.h 2013-01-09 17:42:13.000000000 +0100
-+++ ATLAS/CONFIG/include/atlconf.h 2013-01-09 17:42:15.000000000 +0100
+--- a/CONFIG/include/atlconf.h
++++ b/CONFIG/include/atlconf.h
@@ -84,6 +84,14 @@
( 0 )
#endif
@@ -17,27 +15,23 @@ Index: ATLAS/CONFIG/include/atlconf.h
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 2013-01-09 17:42:14.000000000 +0100
-+++ ATLAS/CONFIG/src/SpewMakeInc.c 2013-01-09 17:42:15.000000000 +0100
-@@ -401,6 +401,8 @@
+--- a/CONFIG/src/SpewMakeInc.c
++++ b/CONFIG/src/SpewMakeInc.c
+@@ -399,6 +399,8 @@
return(sp);
if (MachIsMIPS(arch))
return(sp);
+ if (MachIsSH(arch))
+ return(sp);
if (MachIsS390(arch))
- return((ptrbits == 64) ? "-m64" : "-m31");
+ return(sp);
if (!CompIsGcc(comp))
-Index: ATLAS/CONFIG/src/probe_comp.c
-===================================================================
---- ATLAS.orig/CONFIG/src/probe_comp.c 2013-01-09 17:42:14.000000000 +0100
-+++ ATLAS/CONFIG/src/probe_comp.c 2013-01-09 17:42:15.000000000 +0100
-@@ -592,6 +592,8 @@
+--- a/CONFIG/src/probe_comp.c
++++ b/CONFIG/src/probe_comp.c
+@@ -590,6 +590,8 @@
return(sp);
if (MachIsS390(arch))
- return((ptrbits == 64) ? "-m64" : "-m31");
+ return(sp);
+ if (MachIsSH(arch))
+ return(sp);
if (!CompIsGcc(comp))
diff --git a/debian/patches/kfreebsd.diff b/debian/patches/kfreebsd.diff
index e8ced33..70f693a 100644
--- a/debian/patches/kfreebsd.diff
+++ b/debian/patches/kfreebsd.diff
@@ -1,8 +1,6 @@
-Index: ATLAS/CONFIG/src/SpewMakeInc.c
-===================================================================
---- ATLAS.orig/CONFIG/src/SpewMakeInc.c 2013-01-09 17:42:15.000000000 +0100
-+++ ATLAS/CONFIG/src/SpewMakeInc.c 2013-01-09 17:42:15.000000000 +0100
-@@ -780,8 +780,10 @@
+--- a/CONFIG/src/SpewMakeInc.c
++++ b/CONFIG/src/SpewMakeInc.c
+@@ -778,8 +778,10 @@
fprintf(fpout, " -melf_i386");
else if (ptrbits == 64)
fprintf(fpout, " -melf_x86_64");
@@ -14,4 +12,4 @@ Index: ATLAS/CONFIG/src/SpewMakeInc.c
+
}
}
- if (MachIsS390(mach))
+ fprintf(fpout, "\n F77SYSLIB = %s\n", f77lib ? f77lib : "");
--
ATLAS packaging for Debian
More information about the debian-science-commits
mailing list