Fix FTBFS on Linux based HP-PARisc 32-bit systems. Thanks to John Paul Adrian…

nx-X11/config/cf/Imake.cf

@@ -184,6 +184,12 @@
 #  undef __vax__
 #  define VaxArchitecture
 # endif
+# ifdef __hppa__
+#  ifndef HPArchitecture
+#   define HPArchitecture
+#  endif
+#  undef __hppa__
+# endif /* __hppa__ */
 #endif /* OpenBSD */
 
 /* Systems based on kernel of OpenBSD */
@@ -890,6 +896,12 @@ XCOMM Keep cpp from replacing path elements containing i486/i586/i686
 #  undef MIPSEL
 #  undef _MIPSEL
 # endif
+# ifdef __hppa__
+#  ifndef HPArchitecture
+#   define HPArchitecture
+#  endif
+#  undef __hppa__
+# endif /* __hppa__ */
 # ifdef __sh__
 #  ifndef SuperHArchitecture
 #   define SuperHArchitecture

nx-X11/config/cf/Imake.tmpl

@@ -507,6 +507,8 @@ XCOMM the platform-specific parameters - edit site.def to change
 #define ByteOrder		X_BIG_ENDIAN
 #elif defined(PpcArchitecture) || defined(Ppc64Architecture)
 #define ByteOrder		X_BIG_ENDIAN
+#elif defined(HPArchitecture)
+#define ByteOrder		X_BIG_ENDIAN
 #elif defined(SuperHArchitecture)
 #define ByteOrder		X_LITTLE_ENDIAN
 #elif defined(SuperHebArchitecture)

nx-X11/config/cf/linux.cf

@@ -537,6 +537,13 @@ XCOMM binutils:	(LinuxBinUtilsMajorVersion)
 #   define LdCmd		CcCmd -nostdlib -Wl,"-m alpha"
 #   define AsmDefines		-DUSE_GAS -U__ELF__
 #  endif /* AlphaArchitecture */
+#  ifdef HPArchitecture
+#   define CcCmd               gcc
+#   define CplusplusCmd                g++
+#   define AsCmd               CcCmd -c -x assembler
+#   define LdCmd               CcCmd -nostdlib
+#   define AsmDefines          -DUSE_GAS -U__ELF__
+#  endif /* HPArchitecture */
 #  ifdef i386Architecture
 #   define CcCmd		gcc -b i486-linuxaout
 #   define CplusplusCmd		g++ -b i486-linuxaout
@@ -575,6 +582,13 @@ XCOMM binutils:	(LinuxBinUtilsMajorVersion)
 #   define AsmDefines		-D__ELF__
 #   define CplusplusCmd		c++ -b alpha-linux
 #  endif /* AlphaArchitecture */
+#  ifdef HPArchitecture
+#   define CcCmd		gcc
+#   define CplusplusCmd		g++
+#   define AsCmd		CcCmd -c -x assembler
+#   define LdCmd		CcCmd -nostdlib
+#   define AsmDefines		-D__ELF__
+#  endif /* HPArchitecture */
 #  ifdef i386Architecture
 #   define CcCmd		gcc -b i486-linux
 #   define AsCmd		CcCmd -c -x assembler
@@ -676,6 +690,13 @@ XCOMM binutils:	(LinuxBinUtilsMajorVersion)
 # endif
 #endif /* AlphaArchitecture */
 
+#ifdef HPArchitecture
+# define OptimizedCDebugFlags	-O2  GccAliasingArgs
+# define LinuxMachineDefines	-D__hppa__
+# define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME
+# define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines
+#endif /* HPArchitecture */
+
 #ifdef Arm32Architecture
 # define DefaultCCOptions
 # ifndef OptimizedCDebugFlags

nx-X11/config/cf/xorg.cf

@@ -244,7 +244,7 @@ NX_VERSION_CURRENT_STRING  = nxVersionString
     defined(Sparc64Architecture) || defined(MipsArchitecture) || \
     defined(AlphaArchitecture) || defined(PpcArchitecture) || \
     defined(Mc68020Architecture) || defined(Arm32Architecture) || \
-    defined(SuperHArchitecture)
+    defined(HPArchitecture) || defined(SuperHArchitecture)
 # ifndef XorgServer
 #  define XorgServer		YES
 # endif

nx-X11/extras/Mesa.patches_6.4.1/4004_define-USE_IEEE-macro-for-more-platforms.patch

@@ -5,12 +5,13 @@ Index: Mesa/src/mesa/main/imports.h
 ===================================================================
 --- Mesa.orig/src/mesa/main/imports.h
 +++ Mesa/src/mesa/main/imports.h
-@@ -204,6 +204,8 @@ typedef union { GLfloat f; GLint i; } fi
+@@ -204,6 +204,9 @@ typedef union { GLfloat f; GLint i; } fi
      defined(ia64) || defined(__ia64__) || \
      defined(__mips) || defined(_MIPS_ARCH) || \
      defined(__arm__) || \
 +    defined(__aarch64__) || \
 +    defined(__mc68000__) || \
++    defined(__hppa__) || \
      defined(__sh__) || \
      (defined(__alpha__) && (defined(__IEEE_FLOAT) || !defined(VMS)))
  #define USE_IEEE

nx-X11/include/Xmd.h

@@ -58,6 +58,7 @@ SOFTWARE.
     defined(__ia64__) || defined(ia64) || \
     defined(__sparc64__) || \
     defined(__s390x__) || \
+    (defined(__hppa__) && defined(__LP64__)) || \
     defined(__amd64__) || defined(amd64) || \
     defined(__powerpc64__)
 #define LONG64				/* 32/64-bit architecture */