source: scripts/untested/blfs-patches/mas-cvs-add_amd64.patch@ 873009c

clfs-1.2 clfs-2.1 clfs-3.0.0-systemd clfs-3.0.0-sysvinit systemd sysvinit
Last change on this file since 873009c was 617118d, checked in by Jim Gifford <clfs@…>, 19 years ago

r561@server (orig r559): root | 2005-06-05 02:38:49 -0700
Fixed Directory Structure
  • Property mode set to 100644
File size: 6.0 KB
RevLine 
[617118d]1diff -ur mas-cvs-20050207/clients/util/mas-config.cpp mas-cvs-mod/clients/util/mas-config.cpp
2--- mas-cvs-20050207/clients/util/mas-config.cpp 2004-09-03 08:26:36.000000000 +1000
3+++ mas-cvs-amd64/clients/util/mas-config.cpp 2005-02-10 00:19:20.325851896 +1100
4@@ -1,9 +1,9 @@
5-#!/bin/sh
6+XCOMM!/bin/sh
7
8-#
9-# mas-config.cpp - builds "mas-config" that can echo libraries,
10-# includes, and defines ala gtk's gtk-config.
11-#
12+XCOMM
13+XCOMM mas-config.cpp - builds "mas-config" that can echo libraries,
14+XCOMM includes, and defines ala gtk's gtk-config.
15+XCOMM
16
17 show_usage()
18 {
19diff -ur mas-cvs-20050207/clients/util/mas-launch.cpp mas-cvs-mod/clients/util/mas-launch.cpp
20--- mas-cvs-20050207/clients/util/mas-launch.cpp 2004-06-15 07:32:10.000000000 +1000
21+++ mas-cvs-amd64/clients/util/mas-launch.cpp 2005-02-10 00:20:13.329794072 +1100
22@@ -1,6 +1,6 @@
23-#!/bin/bash
24+XCOMM!/bin/bash
25
26-# kill esound if it's running -- we can't coexist.
27+XCOMM kill esound if it's running -- we can't coexist.
28 pkill esd
29
30 if [[ $1 == "-t" ]];
31diff -ur mas-cvs-20050207/common/mas_endian.h mas-cvs-mod/common/mas_endian.h
32--- mas-cvs-20050207/common/mas_endian.h 2003-01-23 00:26:17.000000000 +1100
33+++ mas-cvs-amd64/common/mas_endian.h 2005-02-07 23:52:27.000000000 +1100
34@@ -137,6 +137,8 @@
35 #if (!defined(MAS_BIG_ENDIAN) && !defined(MAS_LITTLE_ENDIAN))
36
37 #if defined(__i386__) || defined(__ia64__) || defined(WIN32) || \
38+ defined(__amd64__) || defined(__x86_64__) || \
39+ defined(amd64__) || defined(x86_64__) || \
40 (defined(__alpha__) || defined(__alpha)) || \
41 defined(__arm__) || \
42 (defined(__mips__) && defined(__MIPSEL__)) || \
43diff -ur mas-cvs-20050207/config/Imake.cf mas-cvs-mod/config/Imake.cf
44--- mas-cvs-20050207/config/Imake.cf 2003-03-11 08:45:28.000000000 +1100
45+++ mas-cvs-amd64/config/Imake.cf 2005-02-08 00:42:27.000000000 +1100
46@@ -401,17 +401,21 @@
47 # ifdef i386
48 # define i386Architecture
49 # undef i386
50+# endif
51 # ifdef __i386__
52 # ifndef i386Architecture
53 # define i386Architecture
54 # endif
55 # undef __i386__
56 # endif /* i386 */
57+# ifdef __x86_64__
58+# undef __x86_64__
59+# define AMD64Architecture
60+# endif /* x86_64 */
61 # ifdef __alpha
62 # define AlphaArchitecture
63 # undef __alpha
64 # endif /* __alpha */
65-#endif
66 #endif /* linux */
67
68 #ifdef __uxp__
69diff -ur mas-cvs-20050207/config/Imake.tmpl mas-cvs-mod/config/Imake.tmpl
70--- mas-cvs-20050207/config/Imake.tmpl 2003-12-11 10:21:08.000000000 +1100
71+++ mas-cvs-amd64/config/Imake.tmpl 2005-02-09 21:56:46.703200192 +1100
72@@ -337,14 +337,18 @@
73 # define ExportDefines
74 #endif
75
76+#ifndef LibDirName
77+# define LibDirName lib
78+#endif
79+
80 #ifndef UsrLibDir
81 #ifdef ProjectRoot
82-#define UsrLibDir Concat(ProjectRoot,/lib)
83+#define UsrLibDir Concat(ProjectRoot,/LibDirName)
84 #ifndef AlternateUsrLibDir
85 #define AlternateUsrLibDir YES
86 #endif
87 #else
88-#define UsrLibDir /usr/lib
89+#define UsrLibDir Concat(/usr,/LibDirName)
90 #ifndef AlternateUsrLibDir
91 #define AlternateUsrLibDir NO
92 #endif
93@@ -597,7 +601,7 @@
94 #define GzipCmd gzip
95 #endif
96 #ifndef CppCmd
97-#define CppCmd /lib/cpp
98+#define CppCmd /LibDirName/cpp
99 #endif
100 #ifndef CppNoLineInfoOption
101 #define CppNoLineInfoOption /**/
102diff -ur mas-cvs-20050207/config/linux.cf mas-cvs-mod/config/linux.cf
103--- mas-cvs-20050207/config/linux.cf 2003-03-11 08:45:28.000000000 +1100
104+++ mas-cvs-amd64/config/linux.cf 2005-02-09 22:01:41.425395608 +1100
105@@ -195,6 +195,17 @@
106 #endif
107 #endif /* i386Architecture */
108
109+#ifdef AMD64Architecture
110+#define OptimizedCDebugFlags DefaultGcc2AMD64Opt
111+#define LinuxMachineDefines -D__x86_64__
112+#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
113+#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
114+#if UseElfFormat
115+#define HasPlugin YES
116+#define VendorHasX11R6_3libXext YES /* XC or XFree86 3.3.1 */
117+#endif
118+#endif /* AMD64Architecture */
119+
120 #ifdef AlphaArchitecture
121 #define OptimizedCDebugFlags -O2
122 #define LinuxMachineDefines -D__alpha__
123@@ -210,6 +221,20 @@
124 #define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
125 #endif /* Mc68020Architecture */
126
127+#ifndef HaveLib64
128+# if defined (AMD64Architecture)
129+# define HaveLib64 YES
130+# else
131+# define HaveLib64 NO
132+# endif
133+#endif
134+
135+#if HaveLib64
136+# ifndef LibDirName
137+# define LibDirName lib64
138+# endif
139+#endif
140+
141 #define StandardDefines -Dlinux LinuxMachineDefines LinuxSourceDefines
142
143 #define ConnectionFlags -DUNIXCONN -DTCPCONN
144diff -ur mas-cvs-20050207/config/mas.tmpl mas-cvs-mod/config/mas.tmpl
145--- mas-cvs-20050207/config/mas.tmpl 2004-06-15 07:35:36.000000000 +1000
146+++ mas-cvs-amd64/config/mas.tmpl 2005-02-08 00:22:14.000000000 +1100
147@@ -57,6 +57,10 @@
148 MAS_ENDIANNESS = MAS_LITTLE_ENDIAN
149 #define MAS_WE_ARE_LITTLE_ENDIAN
150
151+#elif defined(AMD64Architecture)
152+MAS_ENDIANNESS = MAS_LITTLE_ENDIAN
153+#define MAS_WE_ARE_LITTLE_ENDIAN
154+
155 #elif defined(ia64Architecture)
156 MAS_ENDIANNESS = MAS_LITTLE_ENDIAN
157 #define MAS_WE_ARE_LITTLE_ENDIAN
158diff -ur mas-cvs-20050207/config/xfree86.cf mas-cvs-mod/config/xfree86.cf
159--- mas-cvs-20050207/config/xfree86.cf 2003-06-27 07:00:26.000000000 +1000
160+++ mas-cvs-amd64/config/xfree86.cf 2005-02-07 22:53:17.000000000 +1100
161@@ -586,6 +586,12 @@
162 #endif
163 #endif
164
165+#if HasGcc2 && defined(AMD64Architecture)
166+# ifndef DefaultGcc2AMD64Opt
167+# define DefaultGcc2AMD64Opt -O3 -fno-strength-reduce
168+# endif
169+#endif
170+
171 #ifndef BuildLBXCompatible
172 #define BuildLBXCompatible NO
173 #endif
174diff -ur mas-cvs-20050207/devices/visual/Imakefile mas-cvs-mod/devices/visual/Imakefile
175--- mas-cvs-20050207/devices/visual/Imakefile 2003-03-11 09:29:38.000000000 +1100
176+++ mas-cvs-amd64/devices/visual/Imakefile 2005-02-09 22:04:49.037874176 +1100
177@@ -12,7 +12,7 @@
178 XCOMM ################ Architecture dependent ###########################
179
180 #ifdef LinuxArchitecture
181-ARCHREQUIREDLIBS = -L/usr/X11R6/lib
182+ARCHREQUIREDLIBS = -L/usr/X11R6/LibDirName
183 #endif
184
185 #ifdef SunArchitecture
186@@ -34,7 +34,7 @@
187 LOCAL_LIBRARIES =
188 SYS_LIBRARIES =
189 DEPLIBS =
190- REQUIREDLIBS = $(ARCHREQUIREDLIBS) -L/usr/local/lib -lX11 -lXext -lsrfftw -lsfftw -lm
191+ REQUIREDLIBS = $(ARCHREQUIREDLIBS) -L/usr/local/LibDirName -lX11 -lXext -lsrfftw -lsfftw -lm
192
193 #include <Library.tmpl>
194
Note: See TracBrowser for help on using the repository browser.