1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
|
--- speech_tools/configure.in.orig 2001-06-18 19:21:34.000000000 -0400
+++ speech_tools/configure.in 2002-08-25 18:06:17.000000000 -0400
@@ -42,6 +42,9 @@
AC_C_BIGENDIAN
+AC_CHECK_LIB(termcap, tputs, [TERMCAPLIB=-ltermcap], [TERMCAPLIB=-lncurses])
+AC_SUBST(TERMCAPLIB)
+
dnl Which version of GCC do we have here
COMPILERTYPE=gcc
AC_TRY_COMPILE([#include <stdio.h>],
@@ -52,11 +55,23 @@
[COMPILERTYPE=gcc295])
AC_TRY_COMPILE([#include <stdio.h>],
[int j=
- #if __GNUC__ == 3
+ #if __GNUC__ == 3 && __GNUC_MINOR__ == 0
3;
#endif ],
[COMPILERTYPE=gcc30])
AC_TRY_COMPILE([#include <stdio.h>],
+ [int j=
+ #if __GNUC__ == 3 && __GNUC_MINOR__ == 1
+ 3;
+ #endif ],
+ [COMPILERTYPE=gcc31])
+AC_TRY_COMPILE([#include <stdio.h>],
+ [int j=
+ #if __GNUC__ == 3
+ 3;
+ #endif ],
+ [COMPILERTYPE=gcc32])
+AC_TRY_COMPILE([#include <stdio.h>],
[ int j=
#if __GNUC__ == 2 && __GNUC_MINOR__ == 96
3;
--- speech_tools/config/compilers/Makefile.orig 2001-06-18 19:13:27.000000000 -0400
+++ speech_tools/config/compilers/Makefile 2002-08-25 18:07:11.000000000 -0400
@@ -41,7 +41,7 @@
egcs.mak gcc27emx.mak \
suncc.mak suncc40.mak \
jolt.mak jdk.mak jdk12.mak none.mak \
- jikes.mak gcc296.mak gcc30.mak
+ jikes.mak gcc296.mak gcc30.mak gcc31.mak gcc32.mak
FILES = Makefile $(COMPILERS) gcc_defaults.mak suncc_defaults.mak jdk_defaults.mak jikes_defaults.mak
--- speech_tools/config/compilers/gcc31.mak.orig 2002-09-27 21:18:49.000000000 -0400
+++ speech_tools/config/compilers/gcc31.mak 2002-08-25 18:07:45.000000000 -0400
@@ -0,0 +1,60 @@
+ ###########################################################################
+ ## ##
+ ## Centre for Speech Technology Research ##
+ ## University of Edinburgh, UK ##
+ ## Copyright (c) 1999 ##
+ ## All Rights Reserved. ##
+ ## ##
+ ## Permission is hereby granted, free of charge, to use and distribute ##
+ ## this software and its documentation without restriction, including ##
+ ## without limitation the rights to use, copy, modify, merge, publish, ##
+ ## distribute, sublicense, and/or sell copies of this work, and to ##
+ ## permit persons to whom this work is furnished to do so, subject to ##
+ ## the following conditions: ##
+ ## 1. The code must retain the above copyright notice, this list of ##
+ ## conditions and the following disclaimer. ##
+ ## 2. Any modifications must be clearly marked as such. ##
+ ## 3. Original authors' names are not deleted. ##
+ ## 4. The authors' names are not used to endorse or promote products ##
+ ## derived from this software without specific prior written ##
+ ## permission. ##
+ ## ##
+ ## THE UNIVERSITY OF EDINBURGH AND THE CONTRIBUTORS TO THIS WORK ##
+ ## DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ##
+ ## ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT ##
+ ## SHALL THE UNIVERSITY OF EDINBURGH NOR THE CONTRIBUTORS BE LIABLE ##
+ ## FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES ##
+ ## WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN ##
+ ## AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ##
+ ## ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF ##
+ ## THIS SOFTWARE. ##
+ ## ##
+ ###########################################################################
+ ## ##
+ ## Author: Alan W Black (awb@cs.cmu.edu) ##
+ ## Date: Sun Aug 25 2002 ##
+ ## -------------------------------------------------------------------- ##
+ ## Settings for GCC-3.1 ##
+ ## ##
+ ###########################################################################
+
+include $(EST)/config/compilers/gcc_defaults.mak
+
+COMPILER_DESC=gcc-3.1
+
+ifndef GCC31
+ GCC31 = gcc
+endif
+
+CC= $(GCC31)
+CXX = $(GCC31)
+
+WARN_CXXFLAGS += -Wno-non-template-friend
+
+STATIC_LINKFLAGS = -Dstatic
+
+COMPILERLIBS= $(COMPILER_LIBS_DIR:%=-L%) -lstdc++
+
+
+
+
--- speech_tools/config/compilers/gcc32.mak.orig 2002-09-27 21:18:55.000000000 -0400
+++ speech_tools/config/compilers/gcc32.mak 2002-08-25 18:26:42.000000000 -0400
@@ -0,0 +1,60 @@
+ ###########################################################################
+ ## ##
+ ## Centre for Speech Technology Research ##
+ ## University of Edinburgh, UK ##
+ ## Copyright (c) 1999 ##
+ ## All Rights Reserved. ##
+ ## ##
+ ## Permission is hereby granted, free of charge, to use and distribute ##
+ ## this software and its documentation without restriction, including ##
+ ## without limitation the rights to use, copy, modify, merge, publish, ##
+ ## distribute, sublicense, and/or sell copies of this work, and to ##
+ ## permit persons to whom this work is furnished to do so, subject to ##
+ ## the following conditions: ##
+ ## 1. The code must retain the above copyright notice, this list of ##
+ ## conditions and the following disclaimer. ##
+ ## 2. Any modifications must be clearly marked as such. ##
+ ## 3. Original authors' names are not deleted. ##
+ ## 4. The authors' names are not used to endorse or promote products ##
+ ## derived from this software without specific prior written ##
+ ## permission. ##
+ ## ##
+ ## THE UNIVERSITY OF EDINBURGH AND THE CONTRIBUTORS TO THIS WORK ##
+ ## DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ##
+ ## ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT ##
+ ## SHALL THE UNIVERSITY OF EDINBURGH NOR THE CONTRIBUTORS BE LIABLE ##
+ ## FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES ##
+ ## WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN ##
+ ## AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ##
+ ## ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF ##
+ ## THIS SOFTWARE. ##
+ ## ##
+ ###########################################################################
+ ## ##
+ ## Author: Alan W Black (awb@cs.cmu.edu) ##
+ ## Date: Sun Aug 25 2002 ##
+ ## -------------------------------------------------------------------- ##
+ ## Settings for GCC-3.2 ##
+ ## ##
+ ###########################################################################
+
+include $(EST)/config/compilers/gcc_defaults.mak
+
+COMPILER_DESC=gcc-3.2
+
+ifndef GCC32
+ GCC32 = gcc
+endif
+
+CC= $(GCC32)
+CXX = g++
+
+WARN_CXXFLAGS += -Wno-non-template-friend -Wno-deprecated
+
+STATIC_LINKFLAGS = -Dstatic
+
+COMPILERLIBS= $(COMPILER_LIBS_DIR:%=-L%) -lstdc++
+
+
+
+
|
GitWeb