diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-05-07 19:47:27 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-06-27 19:57:01 +0200 |
| commit | 1839dd642c8acd2958b0c405d4c7da197087c113 (patch) | |
| tree | 106aa7d0f03422aa6add57fc33eb504c0a58a73e | |
| parent | cde05c090e06fd686a11b29eae80a62dd7e59466 (diff) | |
| download | nx-libs-1839dd642c8acd2958b0c405d4c7da197087c113.tar.gz nx-libs-1839dd642c8acd2958b0c405d4c7da197087c113.tar.bz2 nx-libs-1839dd642c8acd2958b0c405d4c7da197087c113.zip | |
Fix FTBFS on mips64el architecture due to missing definition of the _XSERVER64 macro.
| -rw-r--r-- | nx-X11/config/cf/Imake.cf | 3 | ||||
| -rw-r--r-- | nx-X11/config/cf/linux.cf | 15 |
2 files changed, 17 insertions, 1 deletions
diff --git a/nx-X11/config/cf/Imake.cf b/nx-X11/config/cf/Imake.cf index 32f3e321b..47518164b 100644 --- a/nx-X11/config/cf/Imake.cf +++ b/nx-X11/config/cf/Imake.cf @@ -883,6 +883,9 @@ XCOMM Keep cpp from replacing path elements containing i486/i586/i686 # undef __mips__ # if defined(MIPSEL) || defined(_MIPSEL) # define MipselArchitecture +# if (_MIPS_SIM == _ABI64) +# define Mips64elArchitecture +# endif # endif # undef MIPSEL # undef _MIPSEL diff --git a/nx-X11/config/cf/linux.cf b/nx-X11/config/cf/linux.cf index cd34555e6..d860f897e 100644 --- a/nx-X11/config/cf/linux.cf +++ b/nx-X11/config/cf/linux.cf @@ -723,7 +723,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) # define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines #endif /* Mc68020Architecture */ -#ifdef MipsArchitecture +#if defined(MipsArchitecture) && !defined(MipselArchitecture) # ifndef OptimizedCDebugFlags # define OptimizedCDebugFlags DefaultGcc2MipsOpt # endif @@ -732,6 +732,19 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) # define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines #endif +#ifdef MipselArchitecture +# ifndef OptimizedCDebugFlags +# define OptimizedCDebugFlags DefaultGcc2MipsOpt +# endif +# define LinuxMachineDefines -D__MIPSEL__ +# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME +# ifdef Mips64elArchitecture +# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 +# else +# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines +# endif +#endif + #ifdef Ppc64Architecture # define DefaultCCOptions -mminimal-toc # ifndef OptimizedCDebugFlags |