[atlas] 01/08: Rename patches and add some comments.

[Sébastien Villemot]

This is an automated email from the git hooks/post-receive script.

sebastien pushed a commit to branch master
in repository atlas.

commit ab3d4ca03065a2bd0d97de8d13c466955827964c
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Thu Aug 10 14:59:50 2017 +0200

    Rename patches and add some comments.
    
    Gbp-Dch: Ignore
---
 .../{armel-is-v4t.diff => armel-is-v4t.patch}      |  0
 debian/patches/{generic.diff => generic.patch}     |  0
 debian/patches/kfreebsd.diff                       | 15 ---------------
 debian/patches/kfreebsd.patch                      | 22 ++++++++++++++++++++++
 debian/patches/{21_mips2.diff => mips.patch}       | 21 +++++++++++++--------
 ...lapack_atlas.diff => rename-lapack-atlas.patch} |  0
 debian/patches/series                              | 10 +++++-----
 7 files changed, 40 insertions(+), 28 deletions(-)

diff --git a/debian/patches/armel-is-v4t.diff b/debian/patches/armel-is-v4t.patch
similarity index 100%
rename from debian/patches/armel-is-v4t.diff
rename to debian/patches/armel-is-v4t.patch
diff --git a/debian/patches/generic.diff b/debian/patches/generic.patch
similarity index 100%
rename from debian/patches/generic.diff
rename to debian/patches/generic.patch
diff --git a/debian/patches/kfreebsd.diff b/debian/patches/kfreebsd.diff
deleted file mode 100644
index 0e06c3d..0000000
--- a/debian/patches/kfreebsd.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/CONFIG/src/SpewMakeInc.c
-+++ b/CONFIG/src/SpewMakeInc.c
-@@ -802,8 +802,10 @@ int main(int nargs, char **args)
-             fprintf(fpout, " -melf_i386");
-          else if (ptrbits == 64)
-             fprintf(fpout, " -melf_x86_64");
--         if (OS == OSFreeBSD)
--            fprintf(fpout, "_fbsd");
-+ #ifdef __FreeBSD_kernel__
-+          fprintf(fpout, "_fbsd");
-+#endif
-+
-       }
-    }
-    fprintf(fpout, "\n   F77SYSLIB = %s\n", f77lib ? f77lib : "");
diff --git a/debian/patches/kfreebsd.patch b/debian/patches/kfreebsd.patch
new file mode 100644
index 0000000..c5bbded
--- /dev/null
+++ b/debian/patches/kfreebsd.patch
@@ -0,0 +1,22 @@
+Description: Fix linker flag on kfreebsd-* ports
+ GNU/kFreeBSD is detected as Linux (see CONFIG/src/probe_OS.c), hence the test
+ of the OS variable does not work.
+Forwarded: not-needed
+Last-Update: 2017-08-10
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/CONFIG/src/SpewMakeInc.c
++++ b/CONFIG/src/SpewMakeInc.c
+@@ -794,8 +794,10 @@ int main(int nargs, char **args)
+             fprintf(fpout, " -melf_i386");
+          else if (ptrbits == 64)
+             fprintf(fpout, " -melf_x86_64");
+-         if (OS == OSFreeBSD)
+-            fprintf(fpout, "_fbsd");
++ #ifdef __FreeBSD_kernel__
++          fprintf(fpout, "_fbsd");
++#endif
++
+       }
+    }
+    if (MachIsS390(mach))
diff --git a/debian/patches/21_mips2.diff b/debian/patches/mips.patch
similarity index 51%
rename from debian/patches/21_mips2.diff
rename to debian/patches/mips.patch
index 7ffa4ea..3fb39d7 100644
--- a/debian/patches/21_mips2.diff
+++ b/debian/patches/mips.patch
@@ -1,22 +1,27 @@
+Description: On mips{,el}, do not pass -mabi=n32 flag.
+Forwarded: no
+Last-Update: 2017-08-10
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/CONFIG/src/SpewMakeInc.c
 +++ b/CONFIG/src/SpewMakeInc.c
-@@ -408,7 +408,7 @@ char *GetPtrbitsFlag(enum OSTYPE OS, enu
-    if (MachIsARMEL(arch))
-      return(sp);
+@@ -402,7 +402,7 @@ char *GetPtrbitsFlag(enum OSTYPE OS, enu
+    if (MachIsIA64(arch))
+       return(sp);
     if (MachIsMIPS(arch))
 -      return((ptrbits == 64) ? "-mabi=64" : "-mabi=n32");
 +       return(sp);
     if (MachIsS390(arch))
-       return(sp);
+       return((ptrbits == 64) ? "-m64" : "-m31");
     if (OS == OSAIX)
 --- a/CONFIG/src/probe_comp.c
 +++ b/CONFIG/src/probe_comp.c
-@@ -602,7 +602,7 @@ char *GetPtrbitsFlag(enum OSTYPE OS, enu
-    if (MachIsARMEL(arch))
-      return(sp);
+@@ -596,7 +596,7 @@ char *GetPtrbitsFlag(enum OSTYPE OS, enu
+    if (MachIsIA64(arch))
+       return(sp);
     if (MachIsMIPS(arch))
 -      return((ptrbits == 64) ? "-mabi=64" : "-mabi=n32");
 +       return(sp);
     if (MachIsS390(arch))
-       return(sp);
+       return((ptrbits == 64) ? "-m64" : "-m31");
     if (OS == OSAIX)
diff --git a/debian/patches/02_rename_lapack_atlas.diff b/debian/patches/rename-lapack-atlas.patch
similarity index 100%
rename from debian/patches/02_rename_lapack_atlas.diff
rename to debian/patches/rename-lapack-atlas.patch
diff --git a/debian/patches/series b/debian/patches/series
index aeb0ee4..191d3a4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,8 @@
-02_rename_lapack_atlas.diff
-21_mips2.diff
-kfreebsd.diff
-armel-is-v4t.diff
-generic.diff
+rename-lapack-atlas.patch
+mips.patch
+kfreebsd.patch
+armel-is-v4t.patch
+generic.patch
 ppc64el-abiv2.patch
 ppc64el-ifdef-files-with-lvx.patch
 powerpc-dcbt.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/atlas.git