| blob | 389801e1d8d01775355119eee35b1710c1d5511a |
1 --- xc/config/cf/host.def~ Thu May 12 15:28:01 MDT 2005
2 +++ xc/config/cf/host.def Thu May 12 15:28:01 MDT 2005
3 @@ -0,0 +1,45 @@
4 +#define KDriveXServer YES
5 +#define TinyXServer YES
6 +#define XfbdevServer YES
7 +#define CrossCompiling YES
8 +#define ProjectRoot /usr/X11R6
9 +#define NothingOutsideProjectRoot YES
10 +
11 +#define HasFreetype2 YES
12 +#define Freetype2Dir REPLACE_STAGING_DIR
13 +#define HasFontconfig YES
14 +#define FontconfigDir REPLACE_STAGING_DIR
15 +#define HasLibpng YES
16 +#define HasZlib YES
17 +#define HaveLib64 NO
18 +#define LibDirName lib
19 +#define SystemUsrLibDir /usr/lib
20 +#define TkLibDir /usr/lib
21 +
22 +#define HasExpat YES
23 +#define ExpatDir REPLACE_STAGING_DIR
24 +#define XprtServer NO
25 +#define BuildXprintClients NO
26 +#define TouchScreen NO
27 +#define HasTsLib NO
28 +#define BuildDocs NO
29 +#define BuildXF86DRI NO
30 +#define BuildGlxExt NO
31 +#define BuildOSMesaLib NO
32 +#define BuildLBX NO
33 +#define BuildLowMem NO
34 +#define BuildIPv6 NO
35 +#define HasPam NO
36 +#define HasPamMisc NO
37 +#define BuildXterm NO
38 +#define BuildXFree86ConfigTools NO
39 +/*
40 +#define XF86CardDrivers mga glint nv tga s3virge sis rendition \
41 + neomagic i740 tdfx savage \
42 + cirrus vmware tseng trident chips apm \
43 + GlideDriver fbdev i128 \
44 + ati AgpGartDrivers DevelDrivers ark \
45 + cyrix siliconmotion vesa vga \
46 + XF86OSCardDrivers XF86ExtraCardDrivers
47 +*/
48 +
49 +#define XInputDrivers mouse keyboard
50 --- xc/config/cf/cross.def~ Thu May 12 15:28:01 MDT 2005
51 +++ xc/config/cf/cross.def Thu May 12 15:28:01 MDT 2005
52 @@ -1,45 +1,63 @@
53 -/* $XFree86: xc/config/cf/cross.def,v 1.1 2000/12/08 22:09:34 keithp Exp $ */
54 +/* $XFree86: xc/config/cf/cross.def,v 1.2 2001/03/30 02:15:17 keithp Exp $ */
55 /*
56 * This file contains redefinitions of some symbols to enable
57 * cross compilation: e.g. paths for include files and paths to
58 * compiler images. It will have to be edited to reflect these
59 * given your local configuration.
60 */
61 -#if 0
62 +/* Undefine any architectures detected */
63 #undef i386Architecture
64 -#define Arm32Architecture
65 +#undef AMD64Architecture
66 +#undef PpcArchitecture
67 +#undef SparcArchitecture
68 +#undef AlphaArchitecture
69 +#undef Arm32Architecture
70 +#undef ia64Architecture
71 +#undef MipsArchitecture
72 +
73 +/* Cross compiling for: */
74 +#define REPLACE_XORG_ARCHArchitecture
75 +
76 +/* MTRR detection in linux.cf is exec'ed before cross.def, so redo it here */
77 +#undef HasMTRRSupport
78 +#if defined (i386Architecture) || defined (AMD64Architecture)
79 +# define HasMTRRSupport YES
80 +#else
81 +# define HasMTRRSupport NO /* no for non-ix86 */
82 +#endif
84 #undef OptimizedCDebugFlags
85 -#define OptimizedCDebugFlags -O2
86 -#define ServerCDebugFlags -O2
87 +#define OptimizedCDebugFlags -Os
88 +#define ServerCDebugFlags -Os
89 #undef StandardDefines
90 -#define StandardDefines -Dlinux -D__arm__ -D_POSIX_SOURCE \
91 +#define StandardDefines -Dlinux -D__REPLACE_ARCH__ -D_POSIX_SOURCE \
92 -D_BSD_SOURCE -D_GNU_SOURCE -DX_LOCALE
93 #undef CcCmd
94 -#define StdIncDir /skiff/local/arm-linux/include
95 -#define PreIncDir
96 +#define StdIncDir REPLACE_STAGING_DIR/include
97 +#define PreIncDir
98 #undef PostIncDir
99 -#define PostIncDir /skiff/local/lib/gcc-lib/arm-linux/2.95.2/include
100 -#define CcCmd /skiff/local/bin/arm-linux-gcc
101 +#define PostIncDir REPLACE_GCCINC_DIR
102 +#define CcCmd REPLACE_STAGING_DIR/bin/REPLACE_ARCH-linux-gcc
103 #undef CplusplusCmd
104 -#define HasCplusplus YES
105 -#define CplusplusCmd /skiff/local/bin/arm-linux-g++
106 +#define HasCplusplus NO
107 +#define CplusplusCmd NO
108 #define DoRanlibCmd YES
109 -#define RanlibCmd /skiff/local/bin/arm-linux-ranlib
110 +#define RanlibCmd REPLACE_STAGING_DIR/bin/REPLACE_ARCH-linux-ranlib
111 #undef ExtraLoadFlags
112 #define ExtraLoadFlags
113 #define FbNoPixelAddrCode
114 #undef TermcapLibrary
115 -#define TermcapLibrary -ltermcap
116 +#define TermcapLibrary -lncurses
118 #undef LdPostLib
119 -#define LdPostLib -L/skiff/local/arm-linux/lib
120 +#define LdPostLib -LREPLACE_STAGING_DIR/REPLACE_ARCH-linux-uclibc/lib
121 +#undef LdCmd
122 +#define LdCmd REPLACE_STAGING_DIR/bin/REPLACE_ARCH-linux-ld
124 #undef ExtensionOSDefines
125 #define ExtensionOSDefines
127 #define ServerXdmcpDefines /**/
129 #define HostCcCmd cc
130 -#endif
131 #include <cross.rules>
132 --- xc/include/Xfuncs.h.orig 2006-07-07 17:09:16.000000000 -0600
133 +++ xc/include/Xfuncs.h 2006-07-07 17:11:33.000000000 -0600
134 @@ -44,18 +44,28 @@
135 #if defined(SYSV) && !defined(SCO325) && !defined(sun)
136 #include <memory.h>
137 void bcopy();
138 +#ifndef bzero
139 #define bzero(b,len) memset(b, 0, len)
140 +#endif
141 +#ifndef bcmp
142 #define bcmp(b1,b2,len) memcmp(b1, b2, len)
143 +#endif
144 #else
145 #include <string.h>
146 #if defined(SCO325) || defined(sun)
147 #include <strings.h>
148 #endif
149 #define _XFUNCS_H_INCLUDED_STRING_H
150 +#ifndef bcopy
151 #define bcopy(b1,b2,len) memmove(b2, b1, (size_t)(len))
152 +#endif
153 +#ifndef bzero
154 #define bzero(b,len) memset(b, 0, (size_t)(len))
155 +#endif
156 +#ifndef bcmp
157 #define bcmp(b1,b2,len) memcmp(b1, b2, (size_t)(len))
158 #endif
159 +#endif
160 #endif /* X_USEBFUNCS */
162 /* the new Xfuncs.h */