SOURCES: nx-X11-libs.patch (NEW) - patch from mandrake to use -nx ...
undefine
undefine at pld-linux.org
Sun Sep 18 00:04:14 CEST 2005
Author: undefine Date: Sat Sep 17 22:04:13 2005 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- patch from mandrake to use -nx libs
---- Files affected:
SOURCES:
nx-X11-libs.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/nx-X11-libs.patch
diff -u /dev/null SOURCES/nx-X11-libs.patch:1.1
--- /dev/null Sun Sep 18 00:04:13 2005
+++ SOURCES/nx-X11-libs.patch Sun Sep 18 00:04:08 2005
@@ -0,0 +1,541 @@
+diff -Nru /home/couriousous/nx-1.5/nx-X11/config/cf/Imake.cf nx-X11/config/cf/Imake.cf
+--- /home/couriousous/nx-1.5/nx-X11/config/cf/Imake.cf 2003-02-18 17:51:46.000000000 +0100
++++ nx-X11/config/cf/Imake.cf 2005-07-09 15:07:22.181305848 +0200
+@@ -747,6 +747,13 @@
+ # define Mc68020Architecture
+ # undef mc68000
+ # endif /* mc68000 */
++# ifdef __powerpc64__
++# ifndef Ppc64Architecture
++# define Ppc64Architecture
++# endif
++# undef __powerpc64__
++# undef __powerpc__
++# endif
+ # ifdef powerpc
+ # define PpcArchitecture
+ # undef powerpc
+diff -Nru /home/couriousous/nx-1.5/nx-X11/config/cf/X11.tmpl nx-X11/config/cf/X11.tmpl
+--- /home/couriousous/nx-1.5/nx-X11/config/cf/X11.tmpl 2003-05-13 10:39:14.000000000 +0200
++++ nx-X11/config/cf/X11.tmpl 2005-07-09 15:07:22.184305916 +0200
+@@ -469,7 +469,7 @@
+ #endif
+ #endif
+ #ifndef BuildXprintLib
+-#define BuildXprintLib (BuildXprint && !BuildServersOnly)
++#define BuildXprintLib YES
+ #endif
+ #ifndef BuildScreenSaverExt
+ #define BuildScreenSaverExt NO
+diff -Nru /home/couriousous/nx-1.5/nx-X11/config/cf/linux.cf nx-X11/config/cf/linux.cf
+--- /home/couriousous/nx-1.5/nx-X11/config/cf/linux.cf 2005-04-18 20:23:13.000000000 +0200
++++ nx-X11/config/cf/linux.cf 2005-07-09 15:07:22.182305871 +0200
+@@ -288,6 +288,8 @@
+ # elif defined(HPArchitecture)
+ # define BuildXF86DRI NO
+ # elif defined(i386Architecture)
++# elif defined(Ppc64Architecture)
++# define BuildXF86DRI NO
+ # if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 2)
+ # define BuildXF86DRI YES
+ # else
+@@ -519,7 +521,7 @@
+ #define MkdirHierCmd mkdir -p
+
+ #ifndef HaveLib64
+-# if defined (x86_64Architecture) || defined (s390xArchitecture)
++# if defined (x86_64Architecture) || defined (s390xArchitecture) || defined (Ppc64Architecture)
+ # define HaveLib64 YES
+ # else
+ # define HaveLib64 NO
+@@ -809,6 +811,16 @@
+ # define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
+ #endif
+
++#ifdef Ppc64Architecture
++# define DefaultCCOptions -fsigned-char -mminimal-toc
++# ifndef OptimizedCDebugFlags
++# define OptimizedCDebugFlags DefaultGcc2Ppc64Opt
++# endif
++# define LinuxMachineDefines -D__powerpc64__
++# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
++# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
++#endif /* Ppc64Architecture */
++
+ #ifdef PpcArchitecture
+ # define DefaultCCOptions -fsigned-char
+ # ifndef OptimizedCDebugFlags
+diff -Nru /home/couriousous/nx-1.5/nx-X11/config/cf/xfree86.cf nx-X11/config/cf/xfree86.cf
+--- /home/couriousous/nx-1.5/nx-X11/config/cf/xfree86.cf 2003-02-26 21:08:00.000000000 +0100
++++ nx-X11/config/cf/xfree86.cf 2005-07-09 15:07:22.186305961 +0200
+@@ -1099,6 +1099,99 @@
+ # endif
+ #endif
+
++/*
++ * For PowerPC 64bit systems
++ * only libraries are strictly needed
++ */
++#if defined(Ppc64Architecture)
++# ifndef XF86Server
++# define XF86Server YES
++# endif
++/* Amiga framebuffer module */
++# ifndef XF86AFB
++# define XF86AFB NO
++# endif
++/* 1bpp module */
++# ifndef XF1Bpp
++# define XF1Bpp NO
++# endif
++/* 4bpp module */
++# ifndef XF4Bpp
++# define XF4Bpp NO
++# endif
++/* 8/32bpp overlay module */
++# ifndef XF8_32Bpp
++# define XF8_32Bpp YES
++# endif
++/* 8/16bpp dual fb module */
++# ifndef XF8_16Bpp
++# define XF8_16Bpp YES
++# endif
++/* 24/32bpp conversion module */
++# ifndef XF24_32Bpp
++# define XF24_32Bpp YES
++# endif
++/* shadow fb module */
++# ifndef XFShadowFB
++# define XFShadowFB YES
++# endif
++/* vgahw module */
++# ifndef XF86VgaHw
++# define XF86VgaHw NO
++# endif
++/* fbdevhw module */
++# ifndef XF86FBDevHw
++# define XF86FBDevHw YES
++# endif
++/* XAA module */
++# ifndef XF86XAA
++# define XF86XAA YES
++# endif
++/* ramdac module */
++# ifndef XF86Ramdac
++# define XF86Ramdac YES
++# endif
++/* I2C module */
++# ifndef XF86I2C
++# define XF86I2C YES
++# endif
++/* DDC module */
++# ifndef XF86DDC
++# define XF86DDC YES
++# endif
++/* RAC (Resource Access Control) module */
++# ifndef XF86RAC
++# define XF86RAC YES
++# endif
++
++/* int10 module */
++# ifndef XF86Int10
++# define XF86Int10 YES
++# endif
++
++# ifndef DevelDrivers
++# if XFree86Devel
++# define DevelDrivers
++# else
++# define DevelDrivers /* */
++# endif
++# endif
++
++/* Pure PCI drivers should go first */
++# ifndef XF86CardDrivers
++# define XF86CardDrivers ati mga \
++ DevelDrivers \
++ XF86OSCardDrivers XF86ExtraCardDrivers
++# endif
++# if HasGlide3
++# define TdfxDriDriver
++# else
++# define TdfxDriDriver /**/
++# endif
++# ifndef DriDrivers
++# define DriDrivers gamma r128
++# endif
++#endif
+
+ /*
+ * For Mips/Arc platforms, the default is to build all modules which
+@@ -1970,6 +2063,12 @@
+ # endif
+ #endif
+
++#if HasGcc2 && defined(Ppc64Architecture)
++# ifndef DefaultGcc2Ppc64Opt
++# define DefaultGcc2Ppc64Opt -O2 GccAliasingArgs
++# endif
++#endif
++
+ #if HasGcc2 && defined(PpcArchitecture)
+ # ifndef DefaultGcc2PpcOpt
+ # define DefaultGcc2PpcOpt -O2 GccAliasingArgs
+diff -Nru /home/couriousous/nx-1.5/nx-X11/config/imake/imakemdep.h nx-X11/config/imake/imakemdep.h
+--- /home/couriousous/nx-1.5/nx-X11/config/imake/imakemdep.h 2002-12-24 18:42:58.000000000 +0100
++++ nx-X11/config/imake/imakemdep.h 2005-07-09 15:07:22.187305983 +0200
+@@ -611,6 +611,9 @@
+ # ifdef ppc
+ "-Dppc",
+ # endif
++# ifdef ppc64
++ "-Dppc64",
++# endif
+ # if defined(m68k) || defined(M68k) || defined(m68040)
+ "-Dm68k",
+ "-DM68k",
+@@ -670,6 +673,10 @@
+ "-DSVR4",
+ # endif
+ # ifdef __powerpc__
++# ifdef __powerpc64__
++ "-D__powerpc64__",
++# endif
++# else
+ "-D__powerpc__",
+ # endif
+ # ifdef PowerMAX_OS
+@@ -704,6 +711,9 @@
+ # ifdef __ppc__
+ "-D__ppc__",
+ # endif
++# ifdef __ppc64__
++ "-D__ppc64__",
++# endif
+ # ifdef __i386__
+ "-D__i386__",
+ # endif
+@@ -1227,6 +1237,10 @@
+ {"__QNXNTO__", "1"},
+ #endif
+ # ifdef __powerpc__
++# ifdef __powerpc64__
++ {"__powerpc64__", "1"},
++# endif
++# else
+ {"__powerpc__", "1"},
+ # endif
+ # ifdef PowerMAX_OS
+@@ -1301,6 +1315,9 @@
+ #if defined(__ppc__)
+ {"__ppc__", "1"},
+ #endif
++#if defined(__ppc64__)
++ {"__ppc64__", "1"},
++#endif
+ #if defined(__BIG_ENDIAN__)
+ {"__BIG_ENDIAN__", "1"},
+ #endif
+diff -Nru /home/couriousous/nx-1.5/nx-X11/include/Xmd.h nx-X11/include/Xmd.h
+--- /home/couriousous/nx-1.5/nx-X11/include/Xmd.h 2002-05-31 20:45:40.000000000 +0200
++++ nx-X11/include/Xmd.h 2005-07-09 15:07:22.187305983 +0200
+@@ -63,7 +63,8 @@
+ defined(__sparc64__) || \
+ defined(__s390x__) || \
+ (defined(__hppa__) && defined(__LP64__)) || \
+- defined(__x86_64__) || defined(x86_64)
++ defined(__x86_64__) || defined(x86_64) || \
++ defined(__powerpc64__) || defined(powerpc64)
+ #define LONG64 /* 32/64-bit architecture */
+ #endif
+ #ifdef __sgi
+diff -Nru /home/couriousous/nx-1.5/nx-X11/lib/X11/Imakefile nx-X11/lib/X11/Imakefile
+--- /home/couriousous/nx-1.5/nx-X11/lib/X11/Imakefile 2004-04-27 23:05:26.000000000 +0200
++++ nx-X11/lib/X11/Imakefile 2005-07-09 15:07:22.188306006 +0200
+@@ -75,7 +75,7 @@
+ #define DoExtraLib SharedLibX11
+ #define DoDebugLib DebugLibX11
+ #define DoProfileLib ProfileLibX11
+-#define LibName X11
++#define LibName X11-nx
+ #define SoRev SOXLIBREV
+ #define HugeLibrary YES
+ #define IncSubdir X11
+diff -Nru /home/couriousous/nx-1.5/nx-X11/lib/X11/XlcDL.c nx-X11/lib/X11/XlcDL.c
+--- /home/couriousous/nx-1.5/nx-X11/lib/X11/XlcDL.c 2002-11-25 15:04:54.000000000 +0100
++++ nx-X11/lib/X11/XlcDL.c 2005-07-09 15:07:22.188306006 +0200
+@@ -58,10 +58,8 @@
+ #ifdef _LP64
+ # if defined(__sparcv9)
+ # define _MACH64_NAME "sparcv9"
+-# elif defined(__ia64__)
+-# undef MACH64_NAME
+ # else
+-# error "Unknown architecture"
++# undef MACH64_NAME
+ # endif /* defined(__sparcv9) */
+ # ifdef _MACH64_NAME
+ # define _MACH64_NAME_LEN (sizeof (_MACH64_NAME) - 1)
+diff -Nru /home/couriousous/nx-1.5/nx-X11/lib/X11/xlibi18n/im/ximcp/Imakefile nx-X11/lib/X11/xlibi18n/im/ximcp/Imakefile
+--- /home/couriousous/nx-1.5/nx-X11/lib/X11/xlibi18n/im/ximcp/Imakefile 2001-11-16 01:52:30.000000000 +0100
++++ nx-X11/lib/X11/xlibi18n/im/ximcp/Imakefile 2005-07-09 15:07:22.189306028 +0200
+@@ -13,7 +13,7 @@
+
+ CONN_DEFINES = ConnectionFlags
+ XTRANS_XIM_DEFINES = -DXIM_t -DTRANS_CLIENT
+- REQUIREDLIBS = -L$(XENVLIBDIR) -lX11 -lc
++ REQUIREDLIBS = -L$(XENVLIBDIR) -lX11-nx -lc
+
+ LinkSourceFile(imCallbk.c, ../../..)
+ LinkSourceFile(imDefFlt.c, ../../..)
+diff -Nru /home/couriousous/nx-1.5/nx-X11/lib/X11/xlibi18n/lc/Utf8/Imakefile nx-X11/lib/X11/xlibi18n/lc/Utf8/Imakefile
+--- /home/couriousous/nx-1.5/nx-X11/lib/X11/xlibi18n/lc/Utf8/Imakefile 2001-11-16 01:52:30.000000000 +0100
++++ nx-X11/lib/X11/xlibi18n/lc/Utf8/Imakefile 2005-07-09 15:07:22.189306028 +0200
+@@ -4,7 +4,7 @@
+ XI18NLIBNAME = xlibi18n
+ SRCS = lcUTF8Load.c
+ OBJS = ${SRCS:.c=.o}
+- REQUIREDLIBS = -L$(XENVLIBDIR) -lX11 -lc
++ REQUIREDLIBS = -L$(XENVLIBDIR) -lX11-nx -lc
+
+ LinkSourceFile(lcUTF8Load.c, ../../..)
+
+diff -Nru /home/couriousous/nx-1.5/nx-X11/lib/X11/xlibi18n/lc/def/Imakefile nx-X11/lib/X11/xlibi18n/lc/def/Imakefile
+--- /home/couriousous/nx-1.5/nx-X11/lib/X11/xlibi18n/lc/def/Imakefile 2001-11-16 01:52:30.000000000 +0100
++++ nx-X11/lib/X11/xlibi18n/lc/def/Imakefile 2005-07-09 15:07:22.189306028 +0200
+@@ -4,7 +4,7 @@
+ XI18NLIBNAME = xlcDef
+ SRCS = lcDefConv.c
+ OBJS = ${SRCS:.c=.o}
+- REQUIREDLIBS = -L$(XENVLIBDIR) -lX11 -lc
++ REQUIREDLIBS = -L$(XENVLIBDIR) -lX11-nx -lc
+
+ LinkSourceFile(lcDefConv.c, ../../..)
+
+diff -Nru /home/couriousous/nx-1.5/nx-X11/lib/X11/xlibi18n/lc/gen/Imakefile nx-X11/lib/X11/xlibi18n/lc/gen/Imakefile
+--- /home/couriousous/nx-1.5/nx-X11/lib/X11/xlibi18n/lc/gen/Imakefile 2001-11-16 01:52:30.000000000 +0100
++++ nx-X11/lib/X11/xlibi18n/lc/gen/Imakefile 2005-07-09 15:07:22.189306028 +0200
+@@ -4,7 +4,7 @@
+ XI18NLIBNAME = xlibi18n
+ SRCS = lcGenConv.c
+ OBJS = ${SRCS:.c=.o}
+- REQUIREDLIBS = -L$(XENVLIBDIR) -lX11 -lc
++ REQUIREDLIBS = -L$(XENVLIBDIR) -lX11-nx -lc
+
+ LinkSourceFile(lcGenConv.c, ../../..)
+
+diff -Nru /home/couriousous/nx-1.5/nx-X11/lib/X11/xlibi18n/lc/xlocale/Imakefile nx-X11/lib/X11/xlibi18n/lc/xlocale/Imakefile
+--- /home/couriousous/nx-1.5/nx-X11/lib/X11/xlibi18n/lc/xlocale/Imakefile 2001-11-16 01:52:30.000000000 +0100
++++ nx-X11/lib/X11/xlibi18n/lc/xlocale/Imakefile 2005-07-09 15:07:22.190306051 +0200
+@@ -4,7 +4,7 @@
+ XI18NLIBNAME = xlocale
+ SRCS = lcEuc.c lcSjis.c lcJis.c
+ OBJS = ${SRCS:.c=.o}
+- REQUIREDLIBS = -L$(XENVLIBDIR) -lX11 -lc
++ REQUIREDLIBS = -L$(XENVLIBDIR) -lX11-nx -lc
+
+ LinkSourceFile(lcEuc.c, ../../..)
+ LinkSourceFile(lcSjis.c, ../../..)
+diff -Nru /home/couriousous/nx-1.5/nx-X11/lib/X11/xlibi18n/om/generic/Imakefile nx-X11/lib/X11/xlibi18n/om/generic/Imakefile
+--- /home/couriousous/nx-1.5/nx-X11/lib/X11/xlibi18n/om/generic/Imakefile 2001-11-16 01:52:30.000000000 +0100
++++ nx-X11/lib/X11/xlibi18n/om/generic/Imakefile 2005-07-09 15:07:22.190306051 +0200
+@@ -5,7 +5,7 @@
+ omTextEsc.c omTextExt.c omTextPer.c omXChar.c
+
+ OBJS = ${SRCS:.c=.o}
+- REQUIREDLIBS = -L$(XENVLIBDIR) -lX11 -lc
++ REQUIREDLIBS = -L$(XENVLIBDIR) -lX11-nx -lc
+
+ LinkSourceFile(omDefault.c, ../../..)
+ LinkSourceFile(omGeneric.c, ../../..)
+diff -Nru /home/couriousous/nx-1.5/nx-X11/lib/Xaw/Imakefile nx-X11/lib/Xaw/Imakefile
+--- /home/couriousous/nx-1.5/nx-X11/lib/Xaw/Imakefile 2001-01-17 20:42:28.000000000 +0100
++++ nx-X11/lib/Xaw/Imakefile 2005-07-09 15:07:22.190306051 +0200
+@@ -194,6 +194,9 @@
+ XawI18n.o \
+ XawInit.o
+
++#undef DefaultCCOptions
++#define DefaultCCOptions GccWarningOptions
++
+ #include <Library.tmpl>
+
+ #if DoSharedLib && SharedDataSeparation
+diff -Nru /home/couriousous/nx-1.5/nx-X11/lib/Xaw6/Imakefile nx-X11/lib/Xaw6/Imakefile
+--- /home/couriousous/nx-1.5/nx-X11/lib/Xaw6/Imakefile 2002-05-31 20:45:44.000000000 +0200
++++ nx-X11/lib/Xaw6/Imakefile 2005-07-09 15:07:22.190306051 +0200
+@@ -115,6 +115,9 @@
+
+ INCLUDES = -I$(AWIDGETSRC)
+
++#undef DefaultCCOptions
++#define DefaultCCOptions GccWarningOptions
++
+ #include <Library.tmpl>
+
+ #if DoSharedLib && SharedDataSeparation
+diff -Nru /home/couriousous/nx-1.5/nx-X11/lib/Xext/Imakefile nx-X11/lib/Xext/Imakefile
+--- /home/couriousous/nx-1.5/nx-X11/lib/Xext/Imakefile 2003-07-01 12:55:46.000000000 +0200
++++ nx-X11/lib/Xext/Imakefile 2005-07-09 15:07:22.191306073 +0200
+@@ -30,16 +30,18 @@
+ #define DoExtraLib SharedLibXext
+ #define DoDebugLib DebugLibXext
+ #define DoProfileLib ProfileLibXext
+-#define LibName Xext
++#define LibName Xext-nx
+ #define SoRev SOXEXTREV
+ #define LibHeaders NO
+
+ #include <Threads.tmpl>
+
+ #ifdef SharedXextReqs
+-REQUIREDLIBS = SharedXextReqs $(NX_REQUIREDLIBS)
++/* REQUIREDLIBS = SharedXextReqs $(NX_REQUIREDLIBS) */
++REQUIREDLIBS = -L../../exports/lib/ -lX11-nx $(NX_REQUIREDLIBS)
+ #endif
+
++
+ #if HasShm
+ SHMSRCS = XShm.c
+ SHMOBJS = XShm.o
+diff -Nru /home/couriousous/nx-1.5/nx-X11/lib/Xrender/Imakefile nx-X11/lib/Xrender/Imakefile
+--- /home/couriousous/nx-1.5/nx-X11/lib/Xrender/Imakefile 2002-11-14 22:01:18.000000000 +0100
++++ nx-X11/lib/Xrender/Imakefile 2005-07-09 15:07:22.191306073 +0200
+@@ -74,7 +74,7 @@
+ #define DoSharedLib SharedLibXrender
+ #define DoDebugLib DebugLibXrender
+ #define DoProfileLib ProfileLibXrender
+-#define LibName Xrender
++#define LibName Xrender-nx
+ #define SoRev SOXRENDERREV
+
+ #ifdef XBuildIncDir
+@@ -89,7 +89,8 @@
+ #include <Threads.tmpl>
+
+ #ifdef SharedXrenderReqs
+-REQUIREDLIBS = SharedXrenderReqs
++/* REQUIREDLIBS = SharedXrenderReqs */
++REQUIREDLIBS = $(LDPRELIB) -L../../exports/lib/ -lXext-nx -lX11-nx
+ #endif
+
+ #if Malloc0ReturnsNull
+diff -Nru /home/couriousous/nx-1.5/nx-X11/lib/Xt/Xtos.h nx-X11/lib/Xt/Xtos.h
+--- /home/couriousous/nx-1.5/nx-X11/lib/Xt/Xtos.h 2002-04-04 16:05:36.000000000 +0200
++++ nx-X11/lib/Xt/Xtos.h 2005-07-09 15:07:22.191306073 +0200
+@@ -66,7 +66,8 @@
+ defined(__sparc64__) || \
+ defined(__s390x__) || \
+ (defined(__hppa__) && defined(__LP64__)) || \
+- defined(__x86_64__) || defined(x86_64)
++ defined(__x86_64__) || defined(x86_64) || \
++ defined(__powerpc64__) || defined(powerpc64)
+ #define LONG64
+ #endif
+
+diff -Nru /home/couriousous/nx-1.5/nx-X11/lib/Xxf86dga/Imakefile nx-X11/lib/Xxf86dga/Imakefile
+--- /home/couriousous/nx-1.5/nx-X11/lib/Xxf86dga/Imakefile 2003-01-04 03:48:26.000000000 +0100
++++ nx-X11/lib/Xxf86dga/Imakefile 2005-07-09 15:07:22.195306163 +0200
+@@ -28,6 +28,9 @@
+
+ #define IncludeSharedObjectInNormalLib
+
++#undef DefaultCCOptions
++#define DefaultCCOptions GccWarningOptions
++
+ #include <Library.tmpl>
+
+ DependTarget()
+diff -Nru /home/couriousous/nx-1.5/nx-X11/programs/Xserver/Imakefile nx-X11/programs/Xserver/Imakefile
+--- /home/couriousous/nx-1.5/nx-X11/programs/Xserver/Imakefile 2005-05-01 18:23:52.000000000 +0200
++++ nx-X11/programs/Xserver/Imakefile 2005-07-09 15:14:10.706526164 +0200
+@@ -1355,7 +1355,7 @@
+ XPMLIB = -lXpm
+ NXAGENT = hw/nxagent/LibraryTargetName(nxagent)
+ NXAGENTLIBS = PreFbLibs $(NXAGENT) FbPostFbLibs $(NXAGENT) $(MI)
+-NXAGENTSYSLIBS = $(FONTLIBS) $(LDPRELIBS) $(XLIB) $(SYSLIBS) $(XPMLIB)
++NXAGENTSYSLIBS = $(FONTLIBS) $(LDPRELIBS) -lX11-nx -lXext-nx -lXrender-nx $(SYSLIBS) $(XPMLIB)
+ #if HasParallelMake
+ MakeMutex($(NXAGENTDIRS) $(NXAGENTOBJS) $(NXAGENTLIBS) $(NXAGENTSYSLIBS))
+ #endif
+@@ -1371,7 +1371,7 @@
+ #if defined(SunArchitecture)
+ NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -lXcomp -lXcompext -lrt -L/usr/sfw/lib -lXrender
+ #else
+-NXAGENTNXLIBS = -Wl,-rpath-link,../../../nxcomp -Wl,-rpath-link,../../../nxcompext,-lXrender
++NXAGENTNXLIBS = -Wl,-rpath-link,../../../nxcomp -Wl,-rpath-link,../../../nxcompext
+ #endif
+
+ #endif
+diff -Nru /home/couriousous/nx-1.5/nx-X11/programs/Xserver/fb/fb.h nx-X11/programs/Xserver/fb/fb.h
+--- /home/couriousous/nx-1.5/nx-X11/programs/Xserver/fb/fb.h 2003-01-30 22:46:30.000000000 +0100
++++ nx-X11/programs/Xserver/fb/fb.h 2005-07-09 15:07:22.197306208 +0200
+@@ -105,7 +105,8 @@
+ defined(ia64) || defined(__ia64__) || \
+ defined(__sparc64__) || \
+ defined(__s390x__) || \
+- defined(x86_64) || defined (__x86_64__)
++ defined(x86_64) || defined (__x86_64__) || \
++ defined(powerpc64) || defined (__powerpc64__)
+ typedef unsigned long FbBits;
+ # else
+ typedef unsigned long long FbBits;
+diff -Nru /home/couriousous/nx-1.5/nx-X11/programs/Xserver/hw/xfree86/fbdevhw/Imakefile nx-X11/programs/Xserver/hw/xfree86/fbdevhw/Imakefile
+--- /home/couriousous/nx-1.5/nx-X11/programs/Xserver/hw/xfree86/fbdevhw/Imakefile 2002-11-22 23:56:04.000000000 +0100
++++ nx-X11/programs/Xserver/hw/xfree86/fbdevhw/Imakefile 2005-07-09 15:07:22.197306208 +0200
+@@ -1,6 +1,8 @@
+ XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/Imakefile,v 1.12 2002/11/22 22:56:03 tsi Exp $
+
+ #define IHaveModules
++#undef DefaultCCOptions
++#define DefaultCCOptions GccWarningOptions
+ #include <Server.tmpl>
+
+ #if defined(LinuxArchitecture) && LinuxFBDevSupport
+diff -Nru /home/couriousous/nx-1.5/nx-X11/programs/Xserver/hw/xfree86/os-support/bus/Imakefile nx-X11/programs/Xserver/hw/xfree86/os-support/bus/Imakefile
+--- /home/couriousous/nx-1.5/nx-X11/programs/Xserver/hw/xfree86/os-support/bus/Imakefile 2003-02-23 21:26:50.000000000 +0100
++++ nx-X11/programs/Xserver/hw/xfree86/os-support/bus/Imakefile 2005-07-09 15:07:22.198306230 +0200
+@@ -34,6 +34,7 @@
+
+ #elif defined(LinuxArchitecture) && \
+ (defined(PpcArchitecture) || \
++ defined(Ppc64Architecture) || \
+ defined(MipsArchitecture) || \
+ defined(ia64Architecture) || \
+ defined(Mc68020Architecture) || \
+diff -Nru /home/couriousous/nx-1.5/nx-X11/programs/Xserver/hw/xfree86/os-support/bus/Pci.h nx-X11/programs/Xserver/hw/xfree86/os-support/bus/Pci.h
+--- /home/couriousous/nx-1.5/nx-X11/programs/Xserver/hw/xfree86/os-support/bus/Pci.h 2002-12-23 16:37:26.000000000 +0100
++++ nx-X11/programs/Xserver/hw/xfree86/os-support/bus/Pci.h 2005-07-09 15:07:22.198306230 +0200
+@@ -252,7 +252,7 @@
+ # define INCLUDE_XF86_MAP_PCI_MEM
+ # define INCLUDE_XF86_NO_DOMAIN
+ # endif
+-#elif defined(__powerpc__)
++#elif defined(__powerpc__) || defined(__powerpc64__)
+ # if defined(linux)
+ # define ARCH_PCI_INIT linuxPciInit
+ # define INCLUDE_XF86_MAP_PCI_MEM
+diff -Nru /home/couriousous/nx-1.5/nx-X11/programs/Xserver/os/xalloc.c nx-X11/programs/Xserver/os/xalloc.c
+--- /home/couriousous/nx-1.5/nx-X11/programs/Xserver/os/xalloc.c 2003-07-01 15:22:30.000000000 +0200
++++ nx-X11/programs/Xserver/os/xalloc.c 2005-07-09 15:07:22.201306298 +0200
+@@ -183,6 +183,7 @@
+ defined(__ia64__) || defined(ia64) || \
+ defined(__sparc64__) || \
+ defined(__s390x__) || \
++ defined(__powerpc64__) || \
+ defined(__x86_64__) || defined(x86_64)
+ #define MAGIC 0x1404196414071968
+ #define MAGIC_FREE 0x1506196615061966
+diff -Nru /home/couriousous/nx-1.5/nx-X11/programs/xedit/lisp/Imakefile nx-X11/programs/xedit/lisp/Imakefile
+--- /home/couriousous/nx-1.5/nx-X11/programs/xedit/lisp/Imakefile 2002-12-14 05:41:14.000000000 +0100
++++ nx-X11/programs/xedit/lisp/Imakefile 2005-07-09 15:07:22.196306185 +0200
+@@ -98,6 +98,9 @@
+ write.o \
+ xedit.o
+
++#undef DefaultCCOptions
++#define DefaultCCOptions GccWarningOptions
++
+ #include <Library.tmpl>
+
+ AllTarget(ProgramTargetName($(SAMP)))
================================================================
More information about the pld-cvs-commit
mailing list