net/vnc port - Alpha compile testing

[Greg Lewis]

On Wed, Mar 24, 2004 at 10:48:48AM +0000, James Raftery wrote:
> I've updated the FreeBSD.cf patch (URL above. The Imake.cf patch is
> unchanged) to address the -O2 warning on Alpha 4.x and bad paths to cpp.
> If you have the time, could you try again please?

That version works fine except for the Sparc vs. Alpha problem.  The exact
version I used is attached.  I just fixed that problem, but you probably
need to fix the associated comment too.

-- 
Greg Lewis                          Email   : glewis at eyesbeyond.com
Eyes Beyond                         Web     : http://www.eyesbeyond.com
Information Technology              FreeBSD : glewis at FreeBSD.org

-------------- next part --------------
--- Xvnc/config/cf/FreeBSD.cf.orig	Mon Mar 22 16:41:12 2004
+++ Xvnc/config/cf/FreeBSD.cf	Wed Mar 24 10:29:53 2004
@@ -26,6 +26,7 @@
 #define UseGas			YES
 #define GnuCpp			YES
 #define HasNdbm         	YES
+#define DBMLibrary		/* ndbm is in libc */
 #define HasPutenv       	YES
 #define HasSnprintf		YES
 #define HasBSD44Sockets 	YES
@@ -50,7 +51,7 @@
 #define MkdirHierCmd		mkdir -p
 
 #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)
@@ -223,12 +224,29 @@
 # define GccGasOption /**/
 #endif
 
-#define ServerExtraDefines GccGasOption XFree86ServerDefines
+#ifdef i386Architecture
+# define ServerExtraDefines GccGasOption XFree86ServerDefines
+#else
+# define ServerExtraDefines GccGasOption -D_XSERVER64
+#endif
 
 #define StandardDefines	-DCSRG_BASED
 
+#ifdef i386Architecture
+# if OSMajorVersion > 1
+#  define ServerOSDefines		XFree86ServerOSDefines -DDDXTIME
+# else
+#  define ServerOSDefines		XFree86ServerOSDefines -DDDXTIME -DXNO_SYSCONF
+# endif
+#else
+# if defined(SparcArchitecture) || defined(AlphaArchitecture)
+#  define ServerOSDefines 	-DDDXOSINIT
+# else
+#  define ServerOSDefines 	/**/
+# endif
+#endif
+
 #if OSMajorVersion > 1
-#define ServerOSDefines		XFree86ServerOSDefines -DDDXTIME
 #define XawI18nDefines		-DUSE_XWCHAR_STRING
 #define HasMakefileSafeInclude	YES
 #define IncludeMakefile(file) @@# dependencies are in .depend
@@ -241,7 +259,6 @@
 #endif
 #define HasMkstemp		YES
 #else
-#define ServerOSDefines		XFree86ServerOSDefines -DDDXTIME -DXNO_SYSCONF
 #define XawI18nDefines		-DUSE_XWCHAR_STRING -DUSE_XMBTOWC
 #endif
 
@@ -252,10 +269,15 @@
 #endif
 #endif
 
+/* Suppress "The -O2 flag TRIGGERS KNOWN OPTIMIZER BUGS ON THIS PLATFORM" on Sparc 4.x */
 #ifdef i386Architecture
 # define OptimizedCDebugFlags DefaultGcc2i386Opt
 #else
-# define OptimizedCDebugFlags -O2
+# if defined(AlphaArchitecture) && OSMajorVersion < 5
+#  define OptimizedCDebugFlags -O
+# else
+#  define OptimizedCDebugFlags -O2
+# endif
 #endif
 
 #ifndef PreIncDir