[pkg-remote-commits] [nx-libs] 02/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 cdf5fd9d3a0d8f3ae964b1644de3208db4b714b6
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat May 6 22:00:02 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 | 18 ++++++++----------
 debian/patches/series                           |  2 +-
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/debian/patches/0007_fix-ftbfs-on-mips64el.patch b/debian/patches/0007_fix-ftbfs-on-mips64el.patch
index 3f44b10..3a9b5a4 100644
--- a/debian/patches/0007_fix-ftbfs-on-mips64el.patch
+++ b/debian/patches/0007_fix-ftbfs-on-mips64el.patch
@@ -3,22 +3,20 @@ Description: Fix FTBFS on mip64el architecture
 
 --- a/nx-X11/config/cf/Imake.cf
 +++ b/nx-X11/config/cf/Imake.cf
-@@ -887,6 +887,12 @@
+@@ -892,6 +892,10 @@
+ #  endif
  #  undef MIPSEL
  #  undef _MIPSEL
++#  if defined(MipselArchitecture) && (_MIPS_SIM == _ABI64)
++#   define Mips64elArchitecture
++#  endif
++#  undef _MIPS_SIM
  # endif
-+# if defined(mips64) || defined(__mips64__)
-+#  define Mipsel64Architecture
-+#  define MipselArchitecture
-+#  undef mips64
-+#  undef __mips64__
-+# endif
  # ifdef __sh__
  #  ifndef SuperHArchitecture
- #   define SuperHArchitecture
 --- a/nx-X11/config/cf/linux.cf
 +++ b/nx-X11/config/cf/linux.cf
-@@ -724,7 +724,7 @@
+@@ -733,7 +733,7 @@
  # define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines
  #endif /* Mc68020Architecture */
  
@@ -27,7 +25,7 @@ Description: Fix FTBFS on mip64el architecture
  # ifndef OptimizedCDebugFlags
  #  define OptimizedCDebugFlags	DefaultGcc2MipsOpt
  # endif
-@@ -733,6 +733,21 @@
+@@ -742,6 +742,21 @@
  # define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines
  #endif
  
diff --git a/debian/patches/series b/debian/patches/series
index cfc9dc2..fc07fd7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
 0001_fix-ftbfs-on-hppa.patch
-#0007_fix-ftbfs-on-mips64el.patch
+0007_fix-ftbfs-on-mips64el.patch
 2001_nx-X11_install-location.debian.patch
 2002_xserver-xext_set-securitypolicy-path.debian.patch

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