1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-04 22:33:27 +00:00
freebsd-ports/x11-servers/XttXF86srv-common/files/patch-00
Akinori MUSHA c554962384 Update the base XFree86 to 3.3.6.
PR:		ports/19372
Submitted by:	Taguchi, Takesi <taguchi@tohoku.iij.ad.jp> (Maintainer)
2000-06-22 13:19:33 +00:00

72 lines
1.9 KiB
Plaintext

diff -ur /usr/ports/x11/XFree86/work/xc/config/cf/FreeBSD.cf config/cf/FreeBSD.cf
--- /usr/ports/x11/XFree86/work/xc/config/cf/FreeBSD.cf Sun Nov 8 11:19:10 1998
+++ config/cf/FreeBSD.cf Tue Dec 8 10:10:06 1998
diff -ur /usr/ports/x11/XFree86/work/xc/config/cf/Imake.cf config/cf/Imake.cf
@@ -308,7 +308,12 @@
# define AsmDefines AsmElfDefines
#endif
+#ifdef i386Architecture
#define ServerExtraDefines GccGasOption XFree86ServerDefines
+#endif
+#ifdef AlphaArchitecture
+#define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64
+#endif
#define StandardDefines -DCSRG_BASED
@@ -333,14 +338,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
@@ -449,14 +454,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
--- /usr/ports/x11/XFree86/work/xc/config/cf/Imake.cf Fri Nov 13 14:10:12 1998
+++ config/cf/Imake.cf Tue Dec 8 10:05:49 1998
@@ -160,6 +160,11 @@
# define i386Architecture
# undef i386
# endif
+# ifdef __alpha__
+# define AlphaBsdArchitecture
+# define AlphaArchitecture
+# undef __alpha__
+# endif
#endif /* __FreeBSD__ */
#ifdef AMOEBA