[libccp4] 01/02: fix the FTBFS on powerpc
Frédéric-Emmanuel Picca
picca at alioth.debian.org
Sun Sep 15 08:21:29 UTC 2013
This is an automated email from the git hooks/post-receive script.
picca pushed a commit to branch master
in repository libccp4.
commit 93ae58ee298c6ed7081be42e3e731c3a3c99b21b
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date: Sun Sep 15 08:51:35 2013 +0200
fix the FTBFS on powerpc
---
debian/patches/0002-fix-FTBFS-for-powerpc.patch | 59 +++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 60 insertions(+)
diff --git a/debian/patches/0002-fix-FTBFS-for-powerpc.patch b/debian/patches/0002-fix-FTBFS-for-powerpc.patch
new file mode 100644
index 0000000..589d6d8
--- /dev/null
+++ b/debian/patches/0002-fix-FTBFS-for-powerpc.patch
@@ -0,0 +1,59 @@
+From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
+Date: Sun, 15 Sep 2013 08:43:47 +0200
+Subject: fix FTBFS for powerpc
+
+---
+ fortran/library_f.c | 33 ++++-----------------------------
+ 1 file changed, 4 insertions(+), 29 deletions(-)
+
+diff --git a/fortran/library_f.c b/fortran/library_f.c
+index b9e96ce..0041616 100644
+--- a/fortran/library_f.c
++++ b/fortran/library_f.c
+@@ -700,32 +700,9 @@ int ierrno () {
+
+ #endif /* HPUX and AIX support */
+
+-#if ( defined (__APPLE__) && !defined (__GNUC__) )
+-/* apple xlf support */
+-void gerror_ (str, Lstr)
+-char *str;
+-int Lstr;
+-{
+- int i;
+-
+- if (errno == 0) { /* Avoid `Error 0' or some such message */
+- for (i=1; Lstr; i++)
+- str[i] = ' ';
+- } else {
+- (void) strncpy (str, strerror (errno), Lstr);
+- for (i = strlen (str); i < Lstr; i++) str[i] = ' '; /* pad with spaces */
+- }
+-} /* End of gerror (str, Lstr) */
+-
+-int isatty_(int *iunit)
+-{
+- return isatty(*iunit);
+-}
+-
+-#endif /* end of apple xlf support */
+-
+-#if ( defined (__linux__) && defined (_CALL_SYSV) )
+-/* linuxppc xlf support */
++#if !( defined(G95) || defined(GFORTRAN) || defined(F2C) ) && \
++ ( ( defined(__linux__) && defined(_CALL_SYSV) ) || defined(__APPLE__) )
++/* linuxppc xlf and apple xlf support */
+ void gerror_ (str, Lstr)
+ char *str;
+ int Lstr;
+@@ -745,9 +722,7 @@ int isatty_(int *iunit)
+ {
+ return isatty(*iunit);
+ }
+-
+-#endif /* end of linuxppc xlf support */
+-
++#endif /* end of linuxppc/apple xlf support */
+
+ #if defined (sun)
+ int isatty_(int *iunit)
diff --git a/debian/patches/series b/debian/patches/series
index 5a025f7..0115985 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
0001-fix-FTBFS-on-kfreebsd-and-hurd.patch
+0002-fix-FTBFS-for-powerpc.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/libccp4.git
More information about the debian-science-commits
mailing list