diff options
Diffstat (limited to 'x11/xorg-libs/patches/patch-ac')
| -rw-r--r-- | x11/xorg-libs/patches/patch-ac | 45 |
1 files changed, 38 insertions, 7 deletions
diff --git a/x11/xorg-libs/patches/patch-ac b/x11/xorg-libs/patches/patch-ac index c71268e8dd5..947fcc5d405 100644 --- a/x11/xorg-libs/patches/patch-ac +++ b/x11/xorg-libs/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.7 2006/01/18 23:53:06 xtraeme Exp $ +$NetBSD: patch-ac,v 1.8 2006/02/27 22:58:57 joerg Exp $ --- config/cf/NetBSD.cf.in.orig 2005-12-06 10:56:30.000000000 +0100 +++ config/cf/NetBSD.cf.in 2005-12-06 11:01:02.000000000 +0100 -@@ -126,7 +126,7 @@ +@@ -126,7 +126,7 @@ XCOMM operating system: OSName (OSMajor # if ((OSMajorVersion == 2 && OSMinorVersion == 99 && OSTeenyVersion < 11) || \ (OSMajorVersion == 2 && OSMinorVersion < 99) || \ (OSMajorVersion < 2)) @@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.7 2006/01/18 23:53:06 xtraeme Exp $ # endif # define SystemMTDefines -D_REENTRANT # define MTSafeAPIDefines -DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI -@@ -150,7 +150,7 @@ +@@ -150,7 +150,7 @@ XCOMM operating system: OSName (OSMajor #define MkdirHierCmd mkdir -p #undef CcCmd @@ -20,7 +20,7 @@ $NetBSD: patch-ac,v 1.7 2006/01/18 23:53:06 xtraeme Exp $ #ifndef DefaultCCOptions #if defined(UseInstalled) #define DefaultCCOptions /**/ -@@ -166,7 +166,7 @@ +@@ -166,7 +166,7 @@ XCOMM operating system: OSName (OSMajor #endif #endif @@ -29,7 +29,7 @@ $NetBSD: patch-ac,v 1.7 2006/01/18 23:53:06 xtraeme Exp $ #define StandardCppOptions -traditional #define StandardCppDefines /**/ #define PreProcessCmd CcCmd -E -@@ -195,7 +195,7 @@ +@@ -195,7 +195,7 @@ XCOMM operating system: OSName (OSMajor * Disabled for NetBSD/vax until I figure out the scheme. --CS */ #if ((OSMajorVersion > 0) && defined(i386Architecture)) || \ @@ -38,7 +38,29 @@ $NetBSD: patch-ac,v 1.7 2006/01/18 23:53:06 xtraeme Exp $ # ifndef DoLoadableServer # define DoLoadableServer YES # endif -@@ -404,6 +404,10 @@ +@@ -240,16 +240,19 @@ XCOMM operating system: OSName (OSMajor + # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME + # elif defined(PpcArchitecture) + # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DDDXOSINIT ++# elif defined(AMD64Architecture) ++# define ServerOSDefines XFree86ServerOSDefines ++# define ServerExtraSysLibs -lx86_64 + # else + # define ServerOSDefines /**/ + # endif + # if defined(AlphaArchitecture) + # define ServerExtraSysLibs -lalpha +-# else ++# elif !defined(ServerExtraSysLibs) + # define ServerExtraSysLibs /**/ + # endif + #endif +-#ifdef i386Architecture ++#if defined(i386Architecture) || defined(AMD64Architecture) + # define ServerExtraDefines GccGasOption XFree86ServerDefines + # ifndef XFree86ConsoleDefines + # if (OSMajorVersion == 1 && ((OSMinorVersion == 3 && OSTeenyVersion >= 6) \ +@@ -404,6 +407,10 @@ XCOMM operating system: OSName (OSMajor # endif /* MTRRBuiltin */ #endif /* i386Architecture */ @@ -49,7 +71,16 @@ $NetBSD: patch-ac,v 1.7 2006/01/18 23:53:06 xtraeme Exp $ /* * agpgart support (NetBSD 1.5Y and up) */ -@@ -590,7 +594,7 @@ +@@ -420,7 +427,7 @@ XCOMM operating system: OSName (OSMajor + * MMX, SSE and 3DNow will be autodetected. NetBSD 1.6 and up have the + * necessary kernel and toolchain support. + */ +-#if defined(i386Architecture) && \ ++#if (defined(i386Architecture) || defined(AMD64Architecture)) && \ + ((OSMajorVersion > 1) || (OSMajorVersion == 1 && OSMinorVersion > 5)) + # define HasX86Support YES + # define HasMMXSupport YES +@@ -590,7 +597,7 @@ InstallManPageAliasesBase(file,destdir,a # define BuildXInputLib YES #endif |