[pkg-remote-commits] [nx-libs] 04/05: debian/patches: Re-activate 0007_fix-ftbfs-on-mips64el.patch. Hopefully fix FTBFS on Debian's mips64el architecture. Thanks to Paul Wise for pointing us at this solution.

[Mike Gabriel]

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

sunweaver pushed a commit to branch master
in repository nx-libs.

commit 7789ae00e53c2e285939774bd1d84f0a674b7d90
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat May 6 23:24:04 2017 +0200

    debian/patches: Re-activate 0007_fix-ftbfs-on-mips64el.patch. Hopefully fix FTBFS on Debian's mips64el architecture. Thanks to Paul Wise for pointing us at this solution.
---
 debian/patches/0007_fix-ftbfs-on-mips64el.patch | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/debian/patches/0007_fix-ftbfs-on-mips64el.patch b/debian/patches/0007_fix-ftbfs-on-mips64el.patch
index 3a9b5a4..d5a2374 100644
--- a/debian/patches/0007_fix-ftbfs-on-mips64el.patch
+++ b/debian/patches/0007_fix-ftbfs-on-mips64el.patch
@@ -3,17 +3,16 @@ Description: Fix FTBFS on mip64el architecture
 
 --- a/nx-X11/config/cf/Imake.cf
 +++ b/nx-X11/config/cf/Imake.cf
-@@ -892,6 +892,10 @@
+@@ -889,6 +889,9 @@
+ #  undef __mips__
+ #  if defined(MIPSEL) || defined(_MIPSEL)
+ #   define MipselArchitecture
++#   if (_MIPS_SIM == _ABI64)
++#    define Mips64elArchitecture
++#   endif
  #  endif
  #  undef MIPSEL
  #  undef _MIPSEL
-+#  if defined(MipselArchitecture) && (_MIPS_SIM == _ABI64)
-+#   define Mips64elArchitecture
-+#  endif
-+#  undef _MIPS_SIM
- # endif
- # ifdef __sh__
- #  ifndef SuperHArchitecture
 --- a/nx-X11/config/cf/linux.cf
 +++ b/nx-X11/config/cf/linux.cf
 @@ -733,7 +733,7 @@

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-remote/nx-libs.git