Attachment 1171 Details for Bug 1712 – DragonFly addition to xc/config v3

[patch] DragonFly addition to xc/config v3

xc::config::cf::DragonFly.diff (text/plain), 12.69 KB, created by Jeroen Ruigrok van der Werven on 2004-10-26 15:40:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeroen Ruigrok van der Werven

Created: 2004-10-26 15:40:57 UTC

Size: 12.69 KB

patch

obsolete

>diff -ruN /home/asmodai/sources/xorg/xc/config/cf/DragonFly.cf xc/config/cf/DragonFly.cf
>--- /home/asmodai/sources/xorg/xc/config/cf/DragonFly.cf	1970-01-01 01:00:00.000000000 +0100
>+++ xc/config/cf/DragonFly.cf	2004-10-27 02:37:02.000000000 +0200
>@@ -0,0 +1,313 @@
>+XCOMM platform:  $Xorg$
>+
>+#define UseElfFormat		YES
>+
>+#define OSBinaryFormat		[ELF]
>+
>+#ifndef OSName
>+#define OSName			DefaultOSName OSBinaryFormat
>+#endif
>+#ifndef OSVendor
>+#define OSVendor		/**/
>+#endif
>+#ifndef OSMajorVersion
>+#define OSMajorVersion		DefaultOSMajorVersion
>+#endif
>+#ifndef OSMinorVersion
>+#define OSMinorVersion		DefaultOSMinorVersion
>+#endif
>+
>+#ifndef OSRelVersion
>+/* Include this to get finer-grained information about the OS version */
>+#include "/usr/include/osreldate.h"
>+#define OSRelVersion __DragonFly_version
>+#endif
>+
>+XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion) (OSRelVersion)
>+
>+
>+#define HasCplusplus		YES
>+#define GccUsesGas		YES
>+#define UseGas			YES
>+#define GnuCpp			YES
>+#define HasNdbm			YES
>+#define HasPutenv		YES
>+#define HasSnprintf		YES
>+#define HasStrlcat		YES
>+#define HasBasename		YES
>+#define HasBSD44Sockets 	YES
>+#define HasDlopen		YES
>+#define HasSetProcTitle		YES
>+#define HasLibCrypt		YES
>+#define HasShm			YES
>+#define HasWChar32		YES
>+#define HasUsableFileMmap	YES
>+#define HasNCurses		YES
>+#define HasVarRun		YES
>+#define HasVarDb		YES
>+#ifndef BuildPDFdocs
>+#define BuildPDFdocs NO
>+#endif
>+#define HasIssetugid		YES
>+#define HasPoll			YES
>+#define HasGetIfAddrs		YES
>+
>+#define IPv6SocketsAlsoIPv4	NO
>+#define InstallXloadSetGID	NO
>+#define HasWeakSymbols		UseElfFormat
>+
>+/*
>+ * Multi-thread safe libs 
>+ */	
>+#ifndef HasLibPthread
>+# define HasLibPthread         NO
>+#endif
>+#define HasPosixThreads	YES
>+#define ThreadedX		YES
>+#define SystemMTDefines		-D_REENTRANT -D_THREAD_SAFE
>+#define HasThreadSafeAPI	YES
>+#define MTSafeAPIDefines	-DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI
>+#define NeedUIThrStubs	YES
>+#if HasLibPthread
>+# define ThreadsLibraries	-lpthread
>+#else
>+# define NeedUIThrStubs		YES
>+# define ThreadsLibraries	-pthread
>+#endif
>+
>+
>+#define AvoidNullMakeCommand	YES
>+#define StripInstalledPrograms	YES
>+#define CompressAllFonts	YES
>+#define Malloc0ReturnsNull	YES
>+#define NeedConstPrototypes	YES
>+#define NeedFunctionPrototypes	YES
>+#define NeedNestedPrototypes	YES
>+#define NeedVarargsPrototypes	YES
>+#define NeedWidePrototypes	NO
>+
>+#define HasPlugin		YES
>+#define VendorHasX11R6_3libXext	YES	/* XC or XFree86 >= 3.3.1 */
>+
>+#define MkdirHierCmd		mkdir -p
>+
>+#define LexCmd			flex -l
>+#define HasFlex			YES
>+
>+#define HasMktemp		YES
>+
>+#ifndef CcCmd
>+# define CcCmd			cc
>+#endif
>+#ifndef CplusplusCmd
>+# define CplusplusCmd		c++
>+#endif
>+#define CppCmd			/usr/bin/cpp
>+#define PreProcessCmd		CppCmd
>+#define StandardCppOptions	-traditional
>+#define StandardCppDefines	/**/
>+#ifndef DefaultCCOptions
>+# if defined(UseInstalled)
>+#  define DefaultCCOptions	/**/
>+# else
>+#  if defined(HasGcc3) && HasGcc3
>+#   define NoSystemWarn		-Wno-system-headers
>+#  else
>+#   define NoSystemWarn
>+# endif
>+# define DefaultCCOptions	-ansi NoSystemWarn -Dasm=__asm \
>+         			GccWarningOptions
>+#endif
>+#ifndef ExtraLibraries
>+/* support for multi-byte locales is in libxpg4 rather than libc */
>+#define ExtraLibraries		-lxpg4
>+#endif
>+#define HasSetUserContext	YES
>+#define HasGetpeereid		YES
>+#define HasMTRRSupport		YES
>+
>+#ifndef BuildXF86DRI
>+#define BuildXF86DRI		YES
>+#endif
>+
>+#if defined(i386Architecture)
>+#define HasAgpGart		YES
>+#endif
>+
>+/*
>+ * SSE and 3DNow will be autodetected, so binutils is the only 
>+ * requirement for enabling this.
>+ */
>+#if defined(i386Architecture)
>+# define HasX86Support          YES
>+# define HasMMXSupport		YES
>+# define Has3DNowSupport	YES
>+# define HasSSESupport		YES
>+#else
>+# define HasX86Support	        NO
>+# define HasMMXSupport		NO
>+# define Has3DNowSupport	NO
>+# define HasSSESupport		NO
>+#endif
>+
>+#ifndef UseRpath
>+# define UseRpath		YES
>+#endif
>+
>+#ifndef RpathLoadFlags
>+# if UseRpath
>+#  define RpathLoadFlags	-Wl,-rpath,$(USRLIBDIRPATH)
>+# else
>+#  define RpathLoadFlags	/**/
>+# endif
>+#endif
>+
>+#ifndef ExtraLoadFlags
>+# if !defined(UseInstalled)
>+#  define ExtraLoadFlags	RpathLoadFlags -Wl,-rpath-link,$(BUILDLIBDIR)
>+# else
>+#  define ExtraLoadFlags	RpathLoadFlags
>+# endif
>+#endif
>+
>+#endif
>+
>+#ifndef LibraryRpathLoadFlags
>+# if UseRpath
>+#  define LibraryRpathLoadFlags		-rpath $(USRLIBDIRPATH)
>+# else
>+#  define LibraryRpathLoadFlags		/**/
>+# endif
>+#endif
>+
>+#ifndef SharedLibraryLoadFlags
>+# define SharedLibraryLoadFlags		-shared LibraryRpathLoadFlags
>+#endif
>+
>+#ifndef HasZlib
>+# define HasZlib		YES
>+#endif
>+
>+#ifndef HasPam
>+# define HasPam		YES
>+#endif
>+
>+#undef  InstallCmd
>+#define InstallCmd		/usr/bin/install
>+
>+#define AsmElfDefines		-D__ELF__
>+
>+#if GccUsesGas
>+# define GccGasOption		-DGCCUSESGAS
>+# define AsmDefines		-DUSE_GAS AsmElfDefines
>+#else
>+# define GccGasOption		 /**/
>+# define AsmDefines		AsmElfDefines
>+#endif
>+
>+#ifdef i386Architecture
>+#define ServerExtraDefines GccGasOption XFree86ServerDefines
>+#endif
>+#if defined(Sparc64Architecture) || defined(ia64Architecture) || \
>+	defined(AMD64Architecture)
>+#define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64
>+#endif
>+
>+#define StandardDefines	-DCSRG_BASED
>+
>+#define ServerOSDefines		XFree86ServerOSDefines -DDDXTIME
>+#define XawI18nDefines		-DUSE_XWCHAR_STRING
>+#define HasMakefileSafeInclude	YES
>+#define IncludeMakefile(file) @@# dependencies are in .depend
>+#define DependFileName		.depend
>+#ifndef DoLoadableServer
>+# define DoLoadableServer	YES
>+#endif
>+#ifndef ForceNormalLib
>+# define ForceNormalLib		YES
>+#endif
>+#define HasMkstemp		YES
>+
>+#define OptimizedCDebugFlags -O
>+
>+#ifndef PreIncDir
>+# define PreIncDir	/usr/include
>+#endif
>+
>+#define HasGroff	YES
>+#define NroffCmd	env GROFF_NO_SGR=y groff -Tascii
>+#define SetTtyGroup	YES
>+
>+#ifndef ExtraFilesToClean
>+# define ExtraFilesToClean *.core
>+#endif
>+
>+#define DefaultUserPath		/bin:/usr/bin:/sbin:/usr/sbin:$(BINDIR):/usr/local/bin
>+#define DefaultSystemPath	/bin:/usr/bin:/sbin:/usr/sbin:$(BINDIR)
>+#ifndef SystemManDirectory
>+# define SystemManDirectory	/usr/share/man
>+#endif
>+
>+#define InstKmemFlags	-g kmem -m 2755
>+
>+/*
>+ * Compress manual pages
>+ */
>+#ifndef CompressManPages
>+# define CompressManPages	YES
>+#endif
>+
>+#define HasBsdMake	YES
>+
>+#ifndef StaticLibrary
>+# define StaticLibrary(libpath,libname) -Wl,-Bstatic Concat(-L,libpath) Concat(-l,libname) -Wl,-Bdynamic
>+#endif
>+
>+#define DlLibrary		-Wl,--export-dynamic
>+
>+#ifndef PamLibraries
>+# define PamLibraries		-lpam DlLibrary
>+#endif
>+
>+#ifndef SharedLibXdmGreet
>+# define SharedLibXdmGreet		NO
>+#endif
>+
>+/*
>+ * On FreeBSD, the run-time loader will use the built-in "rpath" before
>+ * LD_LIBRARY_PATH.  This means that utilities like mkfontdir will load
>+ * installed libraries (if they exist) in preference to the ones in the
>+ * build tree, even though LD_LIBRARY_PATH points to the build tree.
>+ * This can result in the build failing.  One way to avoid this is to
>+ * pre-load the libraries from the build tree.
>+ *
>+ * There should be a better way than this hack...
>+ */
>+#if UseElfFormat
>+#ifndef PreloadFontSetup
>+#define PreloadFontSetup	LD_PRELOAD="`(cd $(XENVLIBDIR); echo $(XFONTPRELOADPATTERN))`"
>+#endif
>+#ifndef PreloadFreetypeSetup
>+#define PreloadFreetypeSetup	LD_PRELOAD="`(cd $(XENVLIBDIR); echo $(FT2PRELOADPATTERN))`"
>+#endif
>+#ifndef PreloadXFTSetup
>+#define PreloadXFTSetup		LD_PRELOAD="`(cd $(XENVLIBDIR); echo $(FT2PRELOADPATTERN) $(XFTPRELOADPATTERN) $(XRENDERPRELOADPATTERN) $(FCPRELOADPATTERN))`"
>+#endif
>+#endif
>+
>+#ifndef HasCookieMaker
>+# define HasCookieMaker		YES
>+# define MkCookieCmd \
>+	'dd if=/dev/urandom bs=16 count=1 2>/dev/null | hexdump -e \\"%08x\\"'
>+#endif
>+
>+/*
>+ * A hack to work around an optimization problem with gcc 2.95.2 - 2.95.4
>+ */
>+#if (GccMajorVersion == 2 && GccMinorVersion == 95)
>+#define GccOptBug295
>+#endif
>+
>+#include <bsdLib.rules>
>+
>+#include <xorg.cf>
>diff -ruN /home/asmodai/sources/xorg/xc/config/cf/Imake.cf xc/config/cf/Imake.cf
>--- /home/asmodai/sources/xorg/xc/config/cf/Imake.cf	2004-10-18 16:26:35.000000000 +0200
>+++ xc/config/cf/Imake.cf	2004-10-27 02:02:22.000000000 +0200
>@@ -253,6 +253,33 @@
> #define KNetBSDArchitecture
> #endif
> 
>+#ifdef __DragonFly__
>+# define MacroIncludeFile <DragonFly.cf>
>+# define MacroFile DragonFly.cf
>+# undef __DragonFly__
>+# undef __FreeBSD__
>+# define DragonFlyArchitecture
>+# define FreeBSDArchitecture
>+# ifdef __i386__
>+#  define i386BsdArchitecture
>+#  define i386Architecture
>+#  undef i386
>+# endif
>+# ifdef __sparc64__
>+#  define Sparc64Architecture
>+#  undef __sparc64__
>+# endif
>+# ifdef __ia64__
>+#  define ia64Architecture
>+#  undef __ia64__
>+# endif
>+# ifdef __amd64__
>+#  define x86_64Architecture
>+#  undef __amd64__
>+#  undef __x86_64__
>+# endif
>+#endif /* __DragonFly__ */
>+
> #ifdef __FreeBSD__
> # define MacroIncludeFile <FreeBSD.cf>
> # define MacroFile FreeBSD.cf
>diff -ruN /home/asmodai/sources/xorg/xc/config/cf/Imakefile xc/config/cf/Imakefile
>--- /home/asmodai/sources/xorg/xc/config/cf/Imakefile	2004-10-13 18:47:28.000000000 +0200
>+++ xc/config/cf/Imakefile	2004-10-27 01:54:32.000000000 +0200
>@@ -91,6 +91,7 @@
> Imake.cf \
> Amoeba.cf \
> DGUX.cf \
>+DragonFly.cf \
> FreeBSD.cf \
> Mips.cf \
> NetBSD.cf \
>diff -ruN /home/asmodai/sources/xorg/xc/config/imake/imake.c xc/config/imake/imake.c
>--- /home/asmodai/sources/xorg/xc/config/imake/imake.c	2004-10-10 00:04:13.000000000 +0200
>+++ xc/config/imake/imake.c	2004-10-27 02:10:45.000000000 +0200
>@@ -145,7 +145,7 @@
>  *	#include INCLUDE_IMAKEFILE
>  *	<add any global targets like 'clean' and long dependencies>
>  */
>-#if defined(__FreeBSD__) || defined(__NetBSD__)
>+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
> /* This needs to be before _POSIX_SOURCE gets defined */
> # include <sys/param.h>
> # include <sys/types.h>
>@@ -1020,7 +1020,7 @@
> }
> #endif
> 
>-#if defined(__OpenBSD__) 
>+#if defined(__OpenBSD__) || defined(__DragonFly__)
> static void
> get_stackprotector(FILE *inFile)
> {
>@@ -1351,6 +1351,7 @@
>      defined(__NetBSD__) || \
>      defined(__OpenBSD__) || \
>      defined(__FreeBSD__) || \
>+     defined(__DragonFly__) || \
>      defined(__APPLE__) || \
>      defined(__GNU__)
> 	"/usr/bin/cc",	/* for Linux PostIncDir */
>@@ -1684,7 +1685,7 @@
>       fprintf(inFile, "#define DefaultOSTeenyVersion 0\n");
>     }
> #endif /* EMX */
>-#if defined(__OpenBSD__)
>+#if defined(__OpenBSD__) || defined(__DragonFly__)
>   get_stackprotector(inFile);
> #endif
>   return FALSE;
>diff -ruN /home/asmodai/sources/xorg/xc/config/imake/imakemdep.h xc/config/imake/imakemdep.h
>--- /home/asmodai/sources/xorg/xc/config/imake/imakemdep.h	2004-10-19 15:50:06.000000000 +0200
>+++ xc/config/imake/imakemdep.h	2004-10-27 01:53:46.000000000 +0200
>@@ -285,7 +285,7 @@
> #if defined(__386BSD__)
> #define DEFAULT_CPP "/usr/libexec/cpp"
> #endif
>-#if defined(__FreeBSD__)  || defined(__NetBSD__) || defined(__OpenBSD__)
>+#if defined(__FreeBSD__)  || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
> #define USE_CC_E
> #endif
> #if defined(__sgi) && defined(__ANSI_CPP__)
>@@ -348,8 +348,8 @@
> #endif
> #endif
> #if defined(__386BSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || \
>-    defined(__FreeBSD__) || defined(MACH) || defined(linux) || \
>-    defined(__GNU__) || defined(__bsdi__) || defined(__GNUC__)
>+    defined(__FreeBSD__) || defined(__DragonFly__) || defined(MACH) || \
>+    defined(linux) || defined(__GNU__) || defined(__bsdi__) || defined(__GNUC__)
> # ifdef __i386__
> 	"-D__i386__",
> #  if defined(__GNUC__) && (__GNUC__ >= 3)
>@@ -819,14 +819,14 @@
> #  define DEFAULT_OS_MINOR_REV   "r %*d.%[0-9]"
> #  define DEFAULT_OS_TEENY_REV   "v %[0-9]" 
> /* # define DEFAULT_OS_NAME        "srm %[^\n]" */ /* Not useful on ISC */
>-# elif defined(__FreeBSD__) || defined(__OpenBSD__)
>+# elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
> /* BSD/OS too? */
> /* uname -r returns "x.y[.z]-mumble", e.g. "2.1.5-RELEASE" or "2.2-0801SNAP" */
> #  define DEFAULT_OS_MAJOR_REV   "r %[0-9]"
> #  define DEFAULT_OS_MINOR_REV   "r %*d.%[0-9]"
> #  define DEFAULT_OS_TEENY_REV   "r %*d.%*d.%[0-9]" 
> #  define DEFAULT_OS_NAME        "srm %[^\n]"
>-#  if defined(__FreeBSD__)
>+#  if defined(__FreeBSD__) || defined(__DragonFly__)
> /* Use an alternate way to find the teeny version for -STABLE, -SNAP versions */
> #   ifndef CROSSCOMPILE_CPP
> #    define DEFAULT_OS_TEENY_REV_FROB(buf, size)			\
>@@ -1240,6 +1240,9 @@
> #ifdef _MIPS_SZPTR
> 	{"_MIPS_SZPTR", DEF_STRINGIFY(_MIPS_SZPTR)},
> #endif
>+#ifdef __DragonFly__
>+	{"__DragonFly__", "1"},
>+#endif
> #ifdef __FreeBSD__
> 	{"__FreeBSD__", "1"},
> #endif
>@@ -1414,7 +1417,8 @@
>   netBSD,
>   LinuX,
>   emx,
>-  win32
>+  win32,
>+  dragonfly
> } System;
> 
> #   ifdef linux
>@@ -1427,6 +1431,8 @@
> System sys = emx;
> #   elif defined WIN32
> System sys = win32;
>+#   elif defined __DragonFly__
>+System sys = dragonfly;
> #   else
> System sys = unknown;
> #   endif

Actions: View | Splinter Review

Attachments on bug 1712: 1168 | 1169 | 1170 | 1171 | 1172 | 1280 | 2001 | 2004

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.