[pkg-remote-commits] [nx-libs] 01/02: debian/patches: Add 0007_fix-ftbfs-on-mips64el.patch. Blind shot attempt at fixing FTBFS on mip64el architecture.

[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 5b3099bcf47247930d0ad7940922471357b69a0c
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Apr 13 16:40:33 2017 +0200

    debian/patches: Add 0007_fix-ftbfs-on-mips64el.patch. Blind shot attempt at fixing FTBFS on mip64el architecture.
---
 debian/patches/0007_fix-ftbfs-on-mips64el.patch | 51 +++++++++++++++++++++++++
 debian/patches/series                           |  1 +
 2 files changed, 52 insertions(+)

diff --git a/debian/patches/0007_fix-ftbfs-on-mips64el.patch b/debian/patches/0007_fix-ftbfs-on-mips64el.patch
new file mode 100644
index 0000000..3f44b10
--- /dev/null
+++ b/debian/patches/0007_fix-ftbfs-on-mips64el.patch
@@ -0,0 +1,51 @@
+Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+Description: Fix FTBFS on mip64el architecture
+
+--- a/nx-X11/config/cf/Imake.cf
++++ b/nx-X11/config/cf/Imake.cf
+@@ -887,6 +887,12 @@
+ #  undef MIPSEL
+ #  undef _MIPSEL
+ # 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 @@
+ # define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines
+ #endif /* Mc68020Architecture */
+ 
+-#ifdef MipsArchitecture
++#if defined(MipsArchitecture) && !defined(MipselArchitecture)
+ # ifndef OptimizedCDebugFlags
+ #  define OptimizedCDebugFlags	DefaultGcc2MipsOpt
+ # endif
+@@ -733,6 +733,21 @@
+ # define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines
+ #endif
+ 
++#ifdef MipselArchitecture
++# ifndef OptimizedCDebugFlags
++#  define OptimizedCDebugFlags	DefaultGcc2MipsOpt
++# endif
++# define LinuxMachineDefines	-D__MIPSEL__
++# define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME
++# ifdef Mipsel64Architecture
++#  define AsOutputArchSize	64
++#  define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
++# else
++#  define AsOutputArchSize	32
++#  define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines
++# endif
++#endif
++
+ #ifdef Ppc64Architecture
+ # define DefaultCCOptions	-mminimal-toc
+ # ifndef OptimizedCDebugFlags
diff --git a/debian/patches/series b/debian/patches/series
index 0ef1616..d3db640 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,5 +4,6 @@
 0004_nx-X11-gnu-hurd-support.patch
 0005_define-USE_IEEE-macro-for-more-platforms.patch
 0006_fix-duplicate-build-attempt-in-main-Makefile.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