aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/config/cf
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-05-06 00:38:01 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-06-28 20:14:35 +0200
commit347363f3f2088116a493050aa81f77e9993b03a3 (patch)
tree675568418fab9131687276333090db582ea83dc8 /nx-X11/config/cf
parentf77a4b405b2e41b0ae8a0ff1cbf6ee8593c32a7f (diff)
downloadnx-libs-347363f3f2088116a493050aa81f77e9993b03a3.tar.gz
nx-libs-347363f3f2088116a493050aa81f77e9993b03a3.tar.bz2
nx-libs-347363f3f2088116a493050aa81f77e9993b03a3.zip
Fix FTBFS on Linux based HP-PARisc 32-bit systems. Thanks to John Paul Adrian Glaubitz from FU Berlin for providing access to a corresponding porters' machine.
This partially reverts nx-libs commit f6dcf2f. The 'hpux' stuff stays out, the __hppa__ gets re-introduced.
Diffstat (limited to 'nx-X11/config/cf')
-rw-r--r--nx-X11/config/cf/Imake.cf12
-rw-r--r--nx-X11/config/cf/Imake.tmpl2
-rw-r--r--nx-X11/config/cf/linux.cf21
-rw-r--r--nx-X11/config/cf/xorg.cf2
4 files changed, 36 insertions, 1 deletions
diff --git a/nx-X11/config/cf/Imake.cf b/nx-X11/config/cf/Imake.cf
index 47518164b..676c7ebc5 100644
--- a/nx-X11/config/cf/Imake.cf
+++ b/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
diff --git a/nx-X11/config/cf/Imake.tmpl b/nx-X11/config/cf/Imake.tmpl
index 15e3a9ad3..85228ae07 100644
--- a/nx-X11/config/cf/Imake.tmpl
+++ b/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)
diff --git a/nx-X11/config/cf/linux.cf b/nx-X11/config/cf/linux.cf
index b78281cb5..41c85f3c3 100644
--- a/nx-X11/config/cf/linux.cf
+++ b/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
diff --git a/nx-X11/config/cf/xorg.cf b/nx-X11/config/cf/xorg.cf
index 1aa7daf06..13ccd577c 100644
--- a/nx-X11/config/cf/xorg.cf
+++ b/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