diff options
| author | Alexander Leidinger <netchild@FreeBSD.org> | 2005-06-17 22:59:29 +0000 |
|---|---|---|
| committer | Alexander Leidinger <netchild@FreeBSD.org> | 2005-06-17 22:59:29 +0000 |
| commit | 23b3bc4b0d01608d37199d39bb546c6c9d6a8b1d (patch) | |
| tree | fa03305e656151ebe33c7e94eacc947b13d1c273 /x11/XFree86 | |
| parent | b347391f9ad81dd1ebc74b80d713888404b304bd (diff) | |
Notes
Diffstat (limited to 'x11/XFree86')
| -rw-r--r-- | x11/XFree86/files/patch-e | 81 |
1 files changed, 0 insertions, 81 deletions
diff --git a/x11/XFree86/files/patch-e b/x11/XFree86/files/patch-e index cee217ed5cac..e69de29bb2d1 100644 --- a/x11/XFree86/files/patch-e +++ b/x11/XFree86/files/patch-e @@ -1,81 +0,0 @@ ---- config/cf/FreeBSD.cf.orig Wed Jan 9 15:04:16 2002 -+++ config/cf/FreeBSD.cf Wed Jan 9 16:17:59 2002 -@@ -78,7 +78,7 @@ - #endif - - #define CcCmd cc --#define CppCmd /usr/libexec/cpp -+#define CppCmd /usr/bin/cpp - #define PreProcessCmd CppCmd - #define StandardCppDefines -traditional - #if defined(UseInstalled) && (!defined(XF86LinkKit) || !XF86LinkKit) -@@ -141,12 +141,12 @@ - * reason for FreeBSD to assume that it knows where X libraries are installed - * and they can remove it from the list of directories they add to ld.so.cache - * in their /etc/rc file. -+ * -+ * For the ELF case, we default to the ExtraLoadFlags in bsdLib.rules - */ - #if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 2) - #ifndef ExtraLoadFlags --#if UseElfFormat --#define ExtraLoadFlags -Wl,-rpath,$(USRLIBDIRPATH) --#else -+#if !UseElfFormat - #define ExtraLoadFlags -Wl,-R,$(USRLIBDIRPATH) - #endif - #endif -@@ -330,7 +330,13 @@ - # define AsmDefines AsmElfDefines - #endif - -+#ifdef i386Architecture - #define ServerExtraDefines GccGasOption XFree86ServerDefines -+#endif -+#ifdef AlphaArchitecture -+#define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64 -+#define XFree86ConsoleDefines -DSYSCONS_SUPPORT -+#endif - - #define StandardDefines -DCSRG_BASED - -@@ -355,14 +361,14 @@ - /* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */ - #ifndef DefaultGcc2i386Opt - #if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5) --#define DefaultGcc2i386Opt -O2 -+#define DefaultGcc2i386Opt - #endif - #endif - - #ifdef i386Architecture - # define OptimizedCDebugFlags DefaultGcc2i386Opt - #else --# define OptimizedCDebugFlags -O2 -+# define OptimizedCDebugFlags - #endif - - #ifndef PreIncDir -@@ -471,14 +477,18 @@ - #define DlLibrary /**/ - #endif - -+#ifdef AlphaArchitecture -+#define IoLibrary -lio -+#else -+#define IoLibrary /**/ -+#endif -+ - #if BuildDynamicLoading --#define ServerExtraSysLibs DlLibrary -+#define ServerExtraSysLibs DlLibrary IoLibrary - #else --#define ServerExtraSysLibs /**/ -+#define ServerExtraSysLibs IoLibrary - #endif - - #include <bsdLib.rules> - --#ifdef i386Architecture - #include <xfree86.cf> --#endif |