diff options
| author | joerg <joerg@pkgsrc.org> | 2006-04-28 21:52:19 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2006-04-28 21:52:19 +0000 |
| commit | f60368dce2f33104b1fc5034dc1f10071921db02 (patch) | |
| tree | a604f1dc6df6350cf71dbc63319d57cd687e3a21 /x11/xorg-libs | |
| parent | c3d579d367c54f2e05b97938d3711d73b04f5540 (diff) | |
| download | pkgsrc-f60368dce2f33104b1fc5034dc1f10071921db02.tar.gz | |
Fix NetBSD.cf for AMD64's server build as suggested by Matthieu Herrb
via Blair Sadewitz. Fixes PR 33362. Bump revisions of -imake and
-server.
Diffstat (limited to 'x11/xorg-libs')
| -rw-r--r-- | x11/xorg-libs/distinfo | 4 | ||||
| -rw-r--r-- | x11/xorg-libs/patches/patch-ac | 31 |
2 files changed, 25 insertions, 10 deletions
diff --git a/x11/xorg-libs/distinfo b/x11/xorg-libs/distinfo index a476597977f..53fba4adf94 100644 --- a/x11/xorg-libs/distinfo +++ b/x11/xorg-libs/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.41 2006/04/22 14:32:42 joerg Exp $ +$NetBSD: distinfo,v 1.42 2006/04/28 21:52:19 joerg Exp $ SHA1 (X11R6.9.0-src1.tar.gz) = a6c077ed8fdeee5fe1956a427c4cb0bc266e1bef RMD160 (X11R6.9.0-src1.tar.gz) = d12270a4f41a3ceee4bfd5da22d387a3aa707df8 @@ -11,7 +11,7 @@ RMD160 (X11R6.9.0-src3.tar.gz) = 1a2d1855f7b204012627a6c6bf0eaf5245fff414 Size (X11R6.9.0-src3.tar.gz) = 10872474 bytes SHA1 (patch-aa) = 009b7a2679ae98ebd7071e4fa6169c3401273ca1 SHA1 (patch-ab) = 45f06a7d1ac2316621c5707bb202b7f6042699be -SHA1 (patch-ac) = 3fee8b29343e40f81abfc3df7d4ff417efbcaacc +SHA1 (patch-ac) = 841979893b72455ce59b951ac137ca0c236a39f3 SHA1 (patch-ad) = f6bff42193905fd3158b3de52bf925b5fb5f002a SHA1 (patch-ae) = 4d4e00a8f9e226323975596070a8fb3f59c34b4d SHA1 (patch-af) = 62127e39c829cba6b01bd9f3aaaea682eec52c9e diff --git a/x11/xorg-libs/patches/patch-ac b/x11/xorg-libs/patches/patch-ac index 947fcc5d405..9a1c93aec0c 100644 --- a/x11/xorg-libs/patches/patch-ac +++ b/x11/xorg-libs/patches/patch-ac @@ -1,7 +1,7 @@ -$NetBSD: patch-ac,v 1.8 2006/02/27 22:58:57 joerg Exp $ +$NetBSD: patch-ac,v 1.9 2006/04/28 21:52:19 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 +--- config/cf/NetBSD.cf.in.orig 2006-04-28 23:09:24.000000000 +0200 ++++ config/cf/NetBSD.cf.in @@ -126,7 +126,7 @@ XCOMM operating system: OSName (OSMajor # if ((OSMajorVersion == 2 && OSMinorVersion == 99 && OSTeenyVersion < 11) || \ (OSMajorVersion == 2 && OSMinorVersion < 99) || \ @@ -38,7 +38,7 @@ $NetBSD: patch-ac,v 1.8 2006/02/27 22:58:57 joerg Exp $ # ifndef DoLoadableServer # define DoLoadableServer YES # endif -@@ -240,16 +240,19 @@ XCOMM operating system: OSName (OSMajor +@@ -240,17 +240,24 @@ XCOMM operating system: OSName (OSMajor # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME # elif defined(PpcArchitecture) # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DDDXOSINIT @@ -56,11 +56,26 @@ $NetBSD: patch-ac,v 1.8 2006/02/27 22:58:57 joerg Exp $ # endif #endif -#ifdef i386Architecture +-# define ServerExtraDefines GccGasOption XFree86ServerDefines +#if defined(i386Architecture) || defined(AMD64Architecture) - # define ServerExtraDefines GccGasOption XFree86ServerDefines ++# if defined(AMD64Architecture) ++# define ServerExtraDefines XFree86ServerDefines -D_XSERVER64 ++# else ++# define ServerExtraDefines GccGasOption XFree86ServerDefines ++# endif # ifndef XFree86ConsoleDefines # if (OSMajorVersion == 1 && ((OSMinorVersion == 3 && OSTeenyVersion >= 6) \ -@@ -404,6 +407,10 @@ XCOMM operating system: OSName (OSMajor + || OSMinorVersion >= 4) \ +@@ -284,6 +291,8 @@ XCOMM operating system: OSName (OSMajor + # ifndef XFree86ConsoleDefines + # define XFree86ConsoleDefines -DWSCONS_SUPPORT + # endif ++#elif defined(ia64Architecture) ++# define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64 + #else + # define ServerExtraDefines GccGasOption + #endif +@@ -404,6 +413,10 @@ XCOMM operating system: OSName (OSMajor # endif /* MTRRBuiltin */ #endif /* i386Architecture */ @@ -71,7 +86,7 @@ $NetBSD: patch-ac,v 1.8 2006/02/27 22:58:57 joerg Exp $ /* * agpgart support (NetBSD 1.5Y and up) */ -@@ -420,7 +427,7 @@ XCOMM operating system: OSName (OSMajor +@@ -420,7 +433,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. */ @@ -80,7 +95,7 @@ $NetBSD: patch-ac,v 1.8 2006/02/27 22:58:57 joerg Exp $ ((OSMajorVersion > 1) || (OSMajorVersion == 1 && OSMinorVersion > 5)) # define HasX86Support YES # define HasMMXSupport YES -@@ -590,7 +597,7 @@ InstallManPageAliasesBase(file,destdir,a +@@ -590,7 +603,7 @@ InstallManPageAliasesBase(file,destdir,a # define BuildXInputLib YES #endif |