diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-05-06 00:38:01 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-06-28 20:14:35 +0200 |
| commit | 347363f3f2088116a493050aa81f77e9993b03a3 (patch) | |
| tree | 675568418fab9131687276333090db582ea83dc8 /nx-X11/config/cf/linux.cf | |
| parent | f77a4b405b2e41b0ae8a0ff1cbf6ee8593c32a7f (diff) | |
| download | nx-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/linux.cf')
| -rw-r--r-- | nx-X11/config/cf/linux.cf | 21 |
1 files changed, 21 insertions, 0 deletions
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 |