/
arm-apple-darwin.patch
229 lines (225 loc) · 4.69 KB
/
arm-apple-darwin.patch
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
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
--- a/otp_src_R14B01/configure.in 2010-12-07 16:07:22.000000000 +0100
+++ b/otp_src_R14B01/configure.in 2011-02-28 11:55:31.000000000 +0100
@@ -344,9 +344,9 @@
LDFLAGS="-m64 $LDFLAGS"
export LDFLAGS
elif test X"$TMPSYS" '=' X"Darwin-i386"; then
- CFLAGS="-m32 $CFLAGS"
+ CFLAGS="$CFLAGS"
export CFLAGS
- LDFLAGS="-m32 $LDFLAGS"
+ LDFLAGS="$LDFLAGS"
export LDFLAGS
fi
@@ -359,9 +359,9 @@
fi
if test X${enable_m32_build} = Xyes; then
enable_hipe=no
- CFLAGS="-m32 $CFLAGS"
+ CFLAGS="$CFLAGS"
export CFLAGS
- LDFLAGS="-m32 $LDFLAGS"
+ LDFLAGS="$LDFLAGS"
export LDFLAGS
fi
--- a/otp_src_R14B01/configure 2010-12-07 16:07:22.000000000 +0100
+++ b/otp_src_R14B01/configure 2011-02-28 12:11:11.000000000 +0100
@@ -3514,9 +3514,9 @@
LDFLAGS="-m64 $LDFLAGS"
export LDFLAGS
elif test X"$TMPSYS" '=' X"Darwin-i386"; then
- CFLAGS="-m32 $CFLAGS"
+ CFLAGS="$CFLAGS"
export CFLAGS
- LDFLAGS="-m32 $LDFLAGS"
+ LDFLAGS="$LDFLAGS"
export LDFLAGS
fi
@@ -3529,9 +3531,9 @@
fi
if test X${enable_m32_build} = Xyes; then
enable_hipe=no
- CFLAGS="-m32 $CFLAGS"
+ CFLAGS="$CFLAGS"
export CFLAGS
- LDFLAGS="-m32 $LDFLAGS"
+ LDFLAGS="$LDFLAGS"
export LDFLAGS
fi
--- a/otp_src_R14B01/erts/configure.in 2010-12-07 16:07:22.000000000 +0100
+++ b/otp_src_R14B01/erts/configure.in 2011-02-28 11:57:15.000000000 +0100
@@ -351,7 +351,7 @@
*-m32*)
;;
*)
- CFLAGS="-m32 $CFLAGS"
+ CFLAGS="$CFLAGS"
;;
esac
;;
@@ -363,7 +363,7 @@
*-m32*)
;;
*)
- CFLAGS="-m32 $CFLAGS"
+ CFLAGS="$CFLAGS"
;;
esac ;
fi
@@ -483,7 +483,7 @@
*-m32*)
;;
*)
- DEBUG_CFLAGS="-m32 $DEBUG_CFLAGS"
+ DEBUG_CFLAGS="$DEBUG_CFLAGS"
;;
esac
;;
@@ -710,7 +710,7 @@
*-m32*)
;;
*)
- LDFLAGS="-m32 $LDFLAGS"
+ LDFLAGS="$LDFLAGS"
;;
esac
fi
@@ -732,7 +732,7 @@
*-m32*)
;;
*)
- LDFLAGS="-m32 $LDFLAGS"
+ LDFLAGS="$LDFLAGS"
;;
esac ;
fi
@@ -3415,7 +3415,7 @@
;;
*)
if test X${enable_darwin_universal} != Xyes; then
- DED_LDFLAGS="-m32 $DED_LDFLAGS"
+ DED_LDFLAGS="$DED_LDFLAGS"
fi
;;
esac
@@ -3433,7 +3433,7 @@
DED_LDFLAGS="-m64 $DED_LDFLAGS"
fi;
if test X${enable_m32_build} = Xyes; then
- DED_LDFLAGS="-m32 $DED_LDFLAGS"
+ DED_LDFLAGS="$DED_LDFLAGS"
fi
;;
freebsd*)
@@ -3444,7 +3444,7 @@
DED_LDFLAGS="-m64 $DED_LDFLAGS"
fi;
if test X${enable_m32_build} = Xyes; then
- DED_LDFLAGS="-m32 $DED_LDFLAGS"
+ DED_LDFLAGS="$DED_LDFLAGS"
fi
;;
osf*)
@@ -4153,7 +4153,7 @@
if test -z "$CFLAGS32"; then
if test $ac_cv_sizeof_void_p != 4; then
# We are compiling default 64 bits and use -m32 for 32 bit compilations
- CFLAGS32="$CFLAGS -m32"
+ CFLAGS32="$CFLAGS"
else
CFLAGS32="$CFLAGS"
fi
--- a/otp_src_R14B01/erts/configure 2010-12-07 16:07:22.000000000 +0100
+++ b/otp_src_R14B01/erts/configure 2011-02-28 12:05:47.000000000 +0100
@@ -3127,7 +3127,7 @@
*-m32*)
;;
*)
- CFLAGS="-m32 $CFLAGS"
+ CFLAGS="$CFLAGS"
;;
esac
;;
@@ -3139,7 +3140,7 @@
*-m32*)
;;
*)
- CFLAGS="-m32 $CFLAGS"
+ CFLAGS="$CFLAGS"
;;
esac ;
fi
@@ -3988,7 +3990,7 @@
*-m32*)
;;
*)
- DEBUG_CFLAGS="-m32 $DEBUG_CFLAGS"
+ DEBUG_CFLAGS="$DEBUG_CFLAGS"
;;
esac
;;
@@ -5333,7 +5336,7 @@
*-m32*)
;;
*)
- LDFLAGS="-m32 $LDFLAGS"
+ LDFLAGS="$LDFLAGS"
;;
esac
fi
@@ -5357,7 +5361,7 @@
*-m32*)
;;
*)
- LDFLAGS="-m32 $LDFLAGS"
+ LDFLAGS="$LDFLAGS"
;;
esac ;
fi
@@ -25696,7 +25701,7 @@
;;
*)
if test X${enable_darwin_universal} != Xyes; then
- DED_LDFLAGS="-m32 $DED_LDFLAGS"
+ DED_LDFLAGS="$DED_LDFLAGS"
fi
;;
esac
@@ -25714,7 +25720,7 @@
DED_LDFLAGS="-m64 $DED_LDFLAGS"
fi;
if test X${enable_m32_build} = Xyes; then
- DED_LDFLAGS="-m32 $DED_LDFLAGS"
+ DED_LDFLAGS="$DED_LDFLAGS"
fi
;;
freebsd*)
@@ -25725,7 +25732,7 @@
DED_LDFLAGS="-m64 $DED_LDFLAGS"
fi;
if test X${enable_m32_build} = Xyes; then
- DED_LDFLAGS="-m32 $DED_LDFLAGS"
+ DED_LDFLAGS="$DED_LDFLAGS"
fi
;;
osf*)
@@ -27102,7 +27110,7 @@
if test -z "$CFLAGS32"; then
if test $ac_cv_sizeof_void_p != 4; then
# We are compiling default 64 bits and use -m32 for 32 bit compilations
- CFLAGS32="$CFLAGS -m32"
+ CFLAGS32="$CFLAGS"
else
CFLAGS32="$CFLAGS"
fi
--- a/otp_src_R14B01/erts/etc/unix/run_erl.c 2011-02-28 16:41:34.000000000 +0100
+++ b/otp_src_R14B01/erts/etc/unix/run_erl.c 2011-02-28 16:41:20.000000000 +0100
@@ -67,7 +67,7 @@
# include <pty.h>
#endif
#ifdef HAVE_UTMP_H
-# include <utmp.h>
+# include <utime.h>
#endif
#ifdef HAVE_UTIL_H
# include <util.h>