1 |
grobian 12/03/03 12:29:38 |
2 |
|
3 |
Added: perl-5.8.8-darwin-cc-ld.patch |
4 |
perl-5.8.8-solaris11.patch |
5 |
perl-5.12.3-interix.patch |
6 |
perl-5.8.8-usr-local.patch |
7 |
perl-5.10.1-cleanup-paths.patch |
8 |
perl-5.8.8-solaris-relocation.patch |
9 |
perl-5.10.1-hpux.patch |
10 |
perl-5.14.1-cleanup-paths.patch |
11 |
perl-5.12.3-mint.patch perl-5.12.3-aix-soname.patch |
12 |
Log: |
13 |
Revbump of 5.12.4 for Prefix changes, same changes in 5.14.2, transferred Prefix keywords, bug #395685 |
14 |
|
15 |
(Portage version: 2.2.01.20271-prefix/cvs/Darwin i386) |
16 |
|
17 |
Revision Changes Path |
18 |
1.1 dev-lang/perl/files/perl-5.8.8-darwin-cc-ld.patch |
19 |
|
20 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/perl/files/perl-5.8.8-darwin-cc-ld.patch?rev=1.1&view=markup |
21 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/perl/files/perl-5.8.8-darwin-cc-ld.patch?rev=1.1&content-type=text/plain |
22 |
|
23 |
Index: perl-5.8.8-darwin-cc-ld.patch |
24 |
=================================================================== |
25 |
Use $CC to link (and check for broken compilers), such that we don't get |
26 |
linked modules of a different bitness. |
27 |
http://bugs.gentoo.org/show_bug.cgi?id=297751 |
28 |
|
29 |
--- hints/darwin.sh |
30 |
+++ hints/darwin.sh |
31 |
@@ -128,13 +128,13 @@ |
32 |
ccflags="${ccflags} ${cppflags}" |
33 |
|
34 |
# Known optimizer problems. |
35 |
-case "`cc -v 2>&1`" in |
36 |
+case "`${cc:-gcc} -v 2>&1`" in |
37 |
*"3.1 20020105"*) toke_cflags='optimize=""' ;; |
38 |
esac |
39 |
|
40 |
# Shared library extension is .dylib. |
41 |
# Bundle extension is .bundle. |
42 |
-ld='cc'; |
43 |
+ld="${cc:-gcc}"; |
44 |
so='dylib'; |
45 |
dlext='bundle'; |
46 |
usedl='define'; |
47 |
|
48 |
|
49 |
|
50 |
1.1 dev-lang/perl/files/perl-5.8.8-solaris11.patch |
51 |
|
52 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/perl/files/perl-5.8.8-solaris11.patch?rev=1.1&view=markup |
53 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/perl/files/perl-5.8.8-solaris11.patch?rev=1.1&content-type=text/plain |
54 |
|
55 |
Index: perl-5.8.8-solaris11.patch |
56 |
=================================================================== |
57 |
Thanks to the nice OpenSolaris guys, I finally figured out that on |
58 |
OpenSolaris 11, the header dependencies have changed. |
59 |
|
60 |
--- perl.h |
61 |
+++ perl.h |
62 |
@@ -1192,6 +1192,8 @@ |
63 |
*/ |
64 |
|
65 |
#if defined(I_SYSMODE) && !defined(PERL_MICRO) |
66 |
+#include <sys/stat.h> |
67 |
+#include <sys/vnode.h> |
68 |
#include <sys/mode.h> |
69 |
#endif |
70 |
|
71 |
|
72 |
|
73 |
|
74 |
1.1 dev-lang/perl/files/perl-5.12.3-interix.patch |
75 |
|
76 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/perl/files/perl-5.12.3-interix.patch?rev=1.1&view=markup |
77 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/perl/files/perl-5.12.3-interix.patch?rev=1.1&content-type=text/plain |
78 |
|
79 |
Index: perl-5.12.3-interix.patch |
80 |
=================================================================== |
81 |
reported: http://www.xray.mpe.mpg.de/mailing-lists/perl5-porters/2011-04/msg01014.html |
82 |
|
83 |
diff -ru perl-5.12.3.orig/hints/interix.sh perl-5.12.3/hints/interix.sh |
84 |
--- perl-5.12.3.orig/hints/interix.sh 2011-04-27 08:34:00 +0200 |
85 |
+++ perl-5.12.3/hints/interix.sh 2011-04-27 08:53:46 +0200 |
86 |
@@ -6,14 +6,13 @@ |
87 |
cc='gcc' |
88 |
cccdlflags="-DPIC $cccdlflags" |
89 |
ccdlflags='-Wl,-E' |
90 |
-ccflags="-D_ALL_SOURCE $ccflags" |
91 |
-d_poll="$undef" |
92 |
ld='gcc' |
93 |
lddlflags="-shared $lddlflags" |
94 |
rpathflag='-Wl,-R' |
95 |
sharpbang='#!' |
96 |
usemymalloc='false' |
97 |
usenm='false' |
98 |
+firstmakefile=GNUmakefile |
99 |
|
100 |
# This script UU/usethreads.cbu will get 'called-back' by Configure |
101 |
# after it has prompted the user for whether to use threads. |
102 |
|
103 |
|
104 |
|
105 |
1.1 dev-lang/perl/files/perl-5.8.8-usr-local.patch |
106 |
|
107 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/perl/files/perl-5.8.8-usr-local.patch?rev=1.1&view=markup |
108 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/perl/files/perl-5.8.8-usr-local.patch?rev=1.1&content-type=text/plain |
109 |
|
110 |
Index: perl-5.8.8-usr-local.patch |
111 |
=================================================================== |
112 |
# remove /usr/local paths from all stuff thats used |
113 |
# in Configure script, locincpth, loclibpth and glibpth are sedded |
114 |
# afterwards not to conflict with the lib32 and lib64 patches |
115 |
|
116 |
diff -rubB perl-5.8.8.orig/Configure perl-5.8.8/Configure |
117 |
--- perl-5.8.8.orig/Configure Tue Jan 15 10:41:29 2008 |
118 |
+++ perl-5.8.8/Configure Tue Jan 15 10:44:59 2008 |
119 |
@@ -4424,7 +4422,7 @@ |
120 |
: Set private lib path |
121 |
case "$plibpth" in |
122 |
'') if ./mips; then |
123 |
- plibpth="$incpath/usr/lib /usr/local/lib /usr/ccs/lib" |
124 |
+ plibpth="$incpath/usr/lib /usr/ccs/lib" |
125 |
fi;; |
126 |
esac |
127 |
case "$libpth" in |
128 |
@@ -19144,7 +19142,7 @@ |
129 |
case "$ranlib" in |
130 |
:) ranlib='';; |
131 |
'') |
132 |
- ranlib=`./loc ranlib X /usr/bin /bin /usr/local/bin` |
133 |
+ ranlib=`./loc ranlib X /usr/bin /bin` |
134 |
$test -f $ranlib || ranlib='' |
135 |
;; |
136 |
esac |
137 |
|
138 |
|
139 |
|
140 |
1.1 dev-lang/perl/files/perl-5.10.1-cleanup-paths.patch |
141 |
|
142 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/perl/files/perl-5.10.1-cleanup-paths.patch?rev=1.1&view=markup |
143 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/perl/files/perl-5.10.1-cleanup-paths.patch?rev=1.1&content-type=text/plain |
144 |
|
145 |
Index: perl-5.10.1-cleanup-paths.patch |
146 |
=================================================================== |
147 |
cut the crap of inventing paths, or adding search paths that we don't use |
148 |
|
149 |
--- Configure |
150 |
+++ Configure |
151 |
@@ -102,28 +102,6 @@ |
152 |
fi |
153 |
fi |
154 |
|
155 |
-: Proper PATH setting |
156 |
-paths='/bin /usr/bin /usr/local/bin /usr/ucb /usr/local /usr/lbin' |
157 |
-paths="$paths /opt/bin /opt/local/bin /opt/local /opt/lbin" |
158 |
-paths="$paths /usr/5bin /etc /usr/gnu/bin /usr/new /usr/new/bin /usr/nbin" |
159 |
-paths="$paths /opt/gnu/bin /opt/new /opt/new/bin /opt/nbin" |
160 |
-paths="$paths /sys5.3/bin /sys5.3/usr/bin /bsd4.3/bin /bsd4.3/usr/ucb" |
161 |
-paths="$paths /bsd4.3/usr/bin /usr/bsd /bsd43/bin /opt/ansic/bin /usr/ccs/bin" |
162 |
-paths="$paths /etc /usr/lib /usr/ucblib /lib /usr/ccs/lib" |
163 |
-paths="$paths /sbin /usr/sbin /usr/libexec" |
164 |
-paths="$paths /system/gnu_library/bin" |
165 |
- |
166 |
-for p in $paths |
167 |
-do |
168 |
- case "$p_$PATH$p_" in |
169 |
- *$p_$p$p_*) ;; |
170 |
- *) test -d $p && PATH=$PATH$p_$p ;; |
171 |
- esac |
172 |
-done |
173 |
- |
174 |
-PATH=.$p_$PATH |
175 |
-export PATH |
176 |
- |
177 |
: shall we be using ksh? |
178 |
inksh='' |
179 |
needksh='' |
180 |
@@ -8282,66 +8260,6 @@ |
181 |
;; |
182 |
esac |
183 |
|
184 |
-# How will the perl executable find the installed shared $libperl? |
185 |
-# Add $xxx to ccdlflags. |
186 |
-# If we can't figure out a command-line option, use $shrpenv to |
187 |
-# set env LD_RUN_PATH. The main perl makefile uses this. |
188 |
-shrpdir=$archlibexp/CORE |
189 |
-xxx='' |
190 |
-tmp_shrpenv='' |
191 |
-if "$useshrplib"; then |
192 |
- case "$osname" in |
193 |
- aix) |
194 |
- # We'll set it in Makefile.SH... |
195 |
- ;; |
196 |
- solaris) |
197 |
- xxx="-R $shrpdir" |
198 |
- ;; |
199 |
- freebsd|netbsd|openbsd|interix|dragonfly) |
200 |
- xxx="-Wl,-R$shrpdir" |
201 |
- ;; |
202 |
- bsdos|linux|irix*|dec_osf|gnu*) |
203 |
- xxx="-Wl,-rpath,$shrpdir" |
204 |
- ;; |
205 |
- next) |
206 |
- # next doesn't like the default... |
207 |
- ;; |
208 |
- beos) |
209 |
- # beos doesn't like the default, either. |
210 |
- ;; |
211 |
- haiku) |
212 |
- # Haiku doesn't like the default, either. |
213 |
- ;; |
214 |
- hpux*) |
215 |
- # hpux doesn't like the default, either. |
216 |
- tmp_shrpenv="env LDOPTS=\"+s +b${shrpdir}\"" |
217 |
- ;; |
218 |
- cygwin) |
219 |
- # cygwin needs only ldlibpth |
220 |
- ;; |
221 |
- *) |
222 |
- tmp_shrpenv="env LD_RUN_PATH=$shrpdir" |
223 |
- ;; |
224 |
- esac |
225 |
- case "$xxx" in |
226 |
- '') ;; |
227 |
- *) |
228 |
- # Only add $xxx if it isn't already in ccdlflags. |
229 |
- case " $ccdlflags " in |
230 |
- *" $xxx "*) ;; |
231 |
- *) ccdlflags="$ccdlflags $xxx" |
232 |
- cat <<EOM >&4 |
233 |
- |
234 |
-Adding $xxx to the flags |
235 |
-passed to $ld so that the perl executable will find the |
236 |
-installed shared $libperl. |
237 |
- |
238 |
-EOM |
239 |
- ;; |
240 |
- esac |
241 |
- ;; |
242 |
- esac |
243 |
-fi |
244 |
# Fix ccdlflags in AIX for building external extensions. |
245 |
# (For building Perl itself bare -bE:perl.exp is needed, |
246 |
# Makefile.SH takes care of this.) |
247 |
|
248 |
|
249 |
|
250 |
1.1 dev-lang/perl/files/perl-5.8.8-solaris-relocation.patch |
251 |
|
252 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/perl/files/perl-5.8.8-solaris-relocation.patch?rev=1.1&view=markup |
253 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/perl/files/perl-5.8.8-solaris-relocation.patch?rev=1.1&content-type=text/plain |
254 |
|
255 |
Index: perl-5.8.8-solaris-relocation.patch |
256 |
=================================================================== |
257 |
http://sourceware.org/ml/binutils/2005-12/msg00008.html |
258 |
--- hints/solaris_2.sh |
259 |
+++ hints/solaris_2.sh |
260 |
@@ -289,7 +289,7 @@ |
261 |
|
262 |
END |
263 |
ccdlflags="$ccdlflags -Wl,-E" |
264 |
- lddlflags="$lddlflags -Wl,-E -G" |
265 |
+ lddlflags="$lddlflags -shared" |
266 |
fi |
267 |
fi |
268 |
|
269 |
@@ -555,7 +555,7 @@ |
270 |
: #ccflags="$ccflags -Wa,`getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null`" |
271 |
fi |
272 |
ldflags="$ldflags -m64" |
273 |
- lddlflags="$lddlflags -G -m64" |
274 |
+ lddlflags="$lddlflags -m64" |
275 |
;; |
276 |
*) |
277 |
ccflags="$ccflags `getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null`" |
278 |
|
279 |
|
280 |
|
281 |
1.1 dev-lang/perl/files/perl-5.10.1-hpux.patch |
282 |
|
283 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/perl/files/perl-5.10.1-hpux.patch?rev=1.1&view=markup |
284 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/perl/files/perl-5.10.1-hpux.patch?rev=1.1&content-type=text/plain |
285 |
|
286 |
Index: perl-5.10.1-hpux.patch |
287 |
=================================================================== |
288 |
# do not assume '.' being in PATH on hpux, |
289 |
# use 'gcc' as linker, link with '-lm'. |
290 |
|
291 |
--- hints/hpux.sh |
292 |
+++ hints/hpux.sh |
293 |
@@ -190,7 +190,7 @@ |
294 |
$define|true|[Yy]) |
295 |
echo '#include <stdio.h>\nint main(){long l;printf("%d\\n",sizeof(l));}'>try.c |
296 |
$cc -o try $ccflags $ldflags try.c |
297 |
- if [ "`try`" = "8" ]; then |
298 |
+ if [ "`./try`" = "8" ]; then |
299 |
case "$use64bitall" in |
300 |
$define|true|[Yy]) ;; |
301 |
*) cat <<EOM >&4 |
302 |
@@ -338,7 +338,7 @@ |
303 |
} /* main */ |
304 |
EOF |
305 |
$cc -o try $ccflags $ldflags try.c |
306 |
- maxdsiz=`try` |
307 |
+ maxdsiz=`./try` |
308 |
rm -f try try.c core |
309 |
if [ $maxdsiz -le 64 ]; then |
310 |
# 64 Mb is probably not enough to optimize toke.c |
311 |
@@ -363,11 +363,12 @@ |
312 |
"") optimize="-g -O" ;; |
313 |
*O[3456789]*) optimize=`echo "$optimize" | sed -e 's/O[3-9]/O2/'` ;; |
314 |
esac |
315 |
- #ld="$cc" |
316 |
- ld=/usr/bin/ld |
317 |
+ ld="$cc" |
318 |
+ #ld=/usr/bin/ld |
319 |
cccdlflags='-fPIC' |
320 |
- #lddlflags='-shared' |
321 |
- lddlflags='-b' |
322 |
+ lddlflags='-shared' |
323 |
+ #lddlflags='-b' |
324 |
+ libs='-lm' |
325 |
case "$optimize" in |
326 |
*-g*-O*|*-O*-g*) |
327 |
# gcc without gas will not accept -g |
328 |
|
329 |
|
330 |
|
331 |
1.1 dev-lang/perl/files/perl-5.14.1-cleanup-paths.patch |
332 |
|
333 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/perl/files/perl-5.14.1-cleanup-paths.patch?rev=1.1&view=markup |
334 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/perl/files/perl-5.14.1-cleanup-paths.patch?rev=1.1&content-type=text/plain |
335 |
|
336 |
Index: perl-5.14.1-cleanup-paths.patch |
337 |
=================================================================== |
338 |
cut the crap of inventing paths, or adding search paths that we don't use |
339 |
|
340 |
--- Configure |
341 |
+++ Configure |
342 |
@@ -105,28 +105,6 @@ |
343 |
fi |
344 |
fi |
345 |
|
346 |
-: Proper PATH setting |
347 |
-paths='/bin /usr/bin /usr/local/bin /usr/ucb /usr/local /usr/lbin' |
348 |
-paths="$paths /opt/bin /opt/local/bin /opt/local /opt/lbin" |
349 |
-paths="$paths /usr/5bin /etc /usr/gnu/bin /usr/new /usr/new/bin /usr/nbin" |
350 |
-paths="$paths /opt/gnu/bin /opt/new /opt/new/bin /opt/nbin" |
351 |
-paths="$paths /sys5.3/bin /sys5.3/usr/bin /bsd4.3/bin /bsd4.3/usr/ucb" |
352 |
-paths="$paths /bsd4.3/usr/bin /usr/bsd /bsd43/bin /opt/ansic/bin /usr/ccs/bin" |
353 |
-paths="$paths /etc /usr/lib /usr/ucblib /lib /usr/ccs/lib" |
354 |
-paths="$paths /sbin /usr/sbin /usr/libexec" |
355 |
-paths="$paths /system/gnu_library/bin" |
356 |
- |
357 |
-for p in $paths |
358 |
-do |
359 |
- case "$p_$PATH$p_" in |
360 |
- *$p_$p$p_*) ;; |
361 |
- *) test -d $p && PATH=$PATH$p_$p ;; |
362 |
- esac |
363 |
-done |
364 |
- |
365 |
-PATH=.$p_$PATH |
366 |
-export PATH |
367 |
- |
368 |
: shall we be using ksh? |
369 |
inksh='' |
370 |
needksh='' |
371 |
@@ -8287,66 +8265,6 @@ |
372 |
;; |
373 |
esac |
374 |
|
375 |
-# How will the perl executable find the installed shared $libperl? |
376 |
-# Add $xxx to ccdlflags. |
377 |
-# If we can't figure out a command-line option, use $shrpenv to |
378 |
-# set env LD_RUN_PATH. The main perl makefile uses this. |
379 |
-shrpdir=$archlibexp/CORE |
380 |
-xxx='' |
381 |
-tmp_shrpenv='' |
382 |
-if "$useshrplib"; then |
383 |
- case "$osname" in |
384 |
- aix) |
385 |
- # We'll set it in Makefile.SH... |
386 |
- ;; |
387 |
- solaris) |
388 |
- xxx="-R $shrpdir" |
389 |
- ;; |
390 |
- freebsd|mirbsd|netbsd|openbsd|interix|dragonfly) |
391 |
- xxx="-Wl,-R$shrpdir" |
392 |
- ;; |
393 |
- bsdos|linux|irix*|dec_osf|gnu*) |
394 |
- xxx="-Wl,-rpath,$shrpdir" |
395 |
- ;; |
396 |
- next) |
397 |
- # next doesn't like the default... |
398 |
- ;; |
399 |
- beos) |
400 |
- # beos doesn't like the default, either. |
401 |
- ;; |
402 |
- haiku) |
403 |
- # Haiku doesn't like the default, either. |
404 |
- ;; |
405 |
- hpux*) |
406 |
- # hpux doesn't like the default, either. |
407 |
- tmp_shrpenv="env LDOPTS=\"+s +b${shrpdir}\"" |
408 |
- ;; |
409 |
- cygwin) |
410 |
- # cygwin needs only ldlibpth |
411 |
- ;; |
412 |
- *) |
413 |
- tmp_shrpenv="env LD_RUN_PATH=$shrpdir" |
414 |
- ;; |
415 |
- esac |
416 |
- case "$xxx" in |
417 |
- '') ;; |
418 |
- *) |
419 |
- # Only add $xxx if it isn't already in ccdlflags. |
420 |
- case " $ccdlflags " in |
421 |
- *" $xxx "*) ;; |
422 |
- *) ccdlflags="$ccdlflags $xxx" |
423 |
- cat <<EOM >&4 |
424 |
- |
425 |
-Adding $xxx to the flags |
426 |
-passed to $ld so that the perl executable will find the |
427 |
-installed shared $libperl. |
428 |
- |
429 |
-EOM |
430 |
- ;; |
431 |
- esac |
432 |
- ;; |
433 |
- esac |
434 |
-fi |
435 |
# Fix ccdlflags in AIX for building external extensions. |
436 |
# (For building Perl itself bare -bE:perl.exp is needed, |
437 |
# Makefile.SH takes care of this.) |
438 |
|
439 |
|
440 |
|
441 |
1.1 dev-lang/perl/files/perl-5.12.3-mint.patch |
442 |
|
443 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/perl/files/perl-5.12.3-mint.patch?rev=1.1&view=markup |
444 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/perl/files/perl-5.12.3-mint.patch?rev=1.1&content-type=text/plain |
445 |
|
446 |
Index: perl-5.12.3-mint.patch |
447 |
=================================================================== |
448 |
http://rt.perl.org/rt3/Ticket/Display.html?id=89502 |
449 |
|
450 |
--- perl-5.12.3/Configure 2011-02-21 09:18:09.000000000 +0000 |
451 |
+++ perl-5.12.3/Configure 2011-02-21 09:38:49.000000000 +0000 |
452 |
@@ -1275,6 +1275,9 @@ |
453 |
elif test -n "$DJGPP"; then |
454 |
: DOS DJGPP |
455 |
_exe=".exe" |
456 |
+elif test -f "/kern/cookiejar"; then |
457 |
+: MiNT |
458 |
+ _exe="" |
459 |
elif test -d c:/. -o -n "$is_os2" ; then |
460 |
: OS/2 or cygwin |
461 |
_exe=".exe" |
462 |
@@ -1402,7 +1405,7 @@ |
463 |
xcat=/bin/cat |
464 |
test -f $xcat$_exe || xcat=/usr/bin/cat |
465 |
if test ! -f $xcat$_exe; then |
466 |
- for p in `echo $PATH | sed -e "s/$p_/ /g"` $paths; do |
467 |
+ for p in `echo $PATH | sed -e 's/$p_/ /g'` $paths; do |
468 |
if test -f $p/cat$_exe; then |
469 |
xcat=$p/cat |
470 |
break |
471 |
--- perl-5.12.3/ext/DynaLoader/dl_dld.xs 2010-11-21 21:40:55.000000000 +0000 |
472 |
+++ perl-5.12.3/ext/DynaLoader/dl_dld.xs 2011-02-21 09:38:51.000000000 +0000 |
473 |
@@ -116,6 +116,18 @@ |
474 |
goto haverror; |
475 |
} |
476 |
|
477 |
+ DLDEBUG(1,PerlIO_printf(Perl_debug_log, "dld_link(libm.a)\n")); |
478 |
+ if (dlderr = dld_link("/usr/lib/libm.a")) { |
479 |
+ SaveError(aTHX_ "dld_link(libm.a): %s", dld_strerror(dlderr)); |
480 |
+ goto haverror; |
481 |
+ } |
482 |
+ |
483 |
+ DLDEBUG(1,PerlIO_printf(Perl_debug_log, "dld_link(libc.a)\n")); |
484 |
+ if (dlderr = dld_link("/usr/lib/libc.a")) { |
485 |
+ SaveError(aTHX_ "dld_link(libc.a): %s", dld_strerror(dlderr)); |
486 |
+ goto haverror; |
487 |
+ } |
488 |
+ |
489 |
max = AvFILL(dl_resolve_using); |
490 |
for (x = 0; x <= max; x++) { |
491 |
char *sym = SvPVX(*av_fetch(dl_resolve_using, x, 0)); |
492 |
--- perl-5.12.3/malloc.c 2011-01-09 20:20:57.000000000 +0000 |
493 |
+++ perl-5.12.3/malloc.c 2011-02-21 09:38:51.000000000 +0000 |
494 |
@@ -264,7 +264,7 @@ |
495 |
#define MIN_BUC_POW2 (sizeof(void*) > 4 ? 3 : 2) /* Allow for 4-byte arena. */ |
496 |
#define MIN_BUCKET (MIN_BUC_POW2 * BUCKETS_PER_POW2) |
497 |
|
498 |
-#if !(defined(I286) || defined(atarist)) |
499 |
+#if !defined(I286) |
500 |
/* take 2k unless the block is bigger than that */ |
501 |
# define LOG_OF_MIN_ARENA 11 |
502 |
#else |
503 |
@@ -551,8 +551,8 @@ |
504 |
*/ |
505 |
#define u_short unsigned short |
506 |
|
507 |
-/* 286 and atarist like big chunks, which gives too much overhead. */ |
508 |
-#if (defined(RCHECK) || defined(I286) || defined(atarist)) && defined(PACK_MALLOC) |
509 |
+/* 286 like big chunks, which gives too much overhead. */ |
510 |
+#if (defined(RCHECK) || defined(I286)) && defined(PACK_MALLOC) |
511 |
# undef PACK_MALLOC |
512 |
#endif |
513 |
|
514 |
@@ -1734,16 +1734,14 @@ |
515 |
/* Second, check alignment. */ |
516 |
slack = 0; |
517 |
|
518 |
-#if !defined(atarist) /* on the atari we dont have to worry about this */ |
519 |
-# ifndef I286 /* The sbrk(0) call on the I286 always returns the next segment */ |
520 |
+#ifndef I286 /* The sbrk(0) call on the I286 always returns the next segment */ |
521 |
/* WANTED_ALIGNMENT may be more than NEEDED_ALIGNMENT, but this may |
522 |
improve performance of memory access. */ |
523 |
if (PTR2UV(cp) & (WANTED_ALIGNMENT - 1)) { /* Not aligned. */ |
524 |
slack = WANTED_ALIGNMENT - (PTR2UV(cp) & (WANTED_ALIGNMENT - 1)); |
525 |
add += slack; |
526 |
} |
527 |
-# endif |
528 |
-#endif /* !atarist */ |
529 |
+#endif |
530 |
|
531 |
if (add) { |
532 |
DEBUG_m(PerlIO_printf(Perl_debug_log, |
533 |
--- perl-5.12.3/miniperlmain.c 2011-01-09 20:20:57.000000000 +0000 |
534 |
+++ perl-5.12.3/miniperlmain.c 2011-02-21 09:38:49.000000000 +0000 |
535 |
@@ -45,7 +45,7 @@ |
536 |
#if defined (atarist) |
537 |
/* The Atari operating system doesn't have a dynamic stack. The |
538 |
stack size is determined from this value. */ |
539 |
-long _stksize = 64 * 1024; |
540 |
+long _stksize = 256 * 1024; |
541 |
#endif |
542 |
|
543 |
#if defined(PERL_GLOBAL_STRUCT_PRIVATE) |
544 |
--- perl-5.12.3/os2/perlrexx.c 2010-11-21 21:40:56.000000000 +0000 |
545 |
+++ perl-5.12.3/os2/perlrexx.c 2011-02-21 09:42:49.000000000 +0000 |
546 |
@@ -38,7 +38,7 @@ |
547 |
#if defined (atarist) |
548 |
/* The Atari operating system doesn't have a dynamic stack. The |
549 |
stack size is determined from this value. */ |
550 |
-long _stksize = 64 * 1024; |
551 |
+long _stksize = 256 * 1024; |
552 |
#endif |
553 |
|
554 |
/* Register any extra external extensions */ |
555 |
--- perl-5.12.3/perl.c 2011-02-21 09:17:19.000000000 +0000 |
556 |
+++ perl-5.12.3/perl.c 2011-02-21 09:38:50.000000000 +0000 |
557 |
@@ -3272,10 +3272,6 @@ |
558 |
"\n\nOS/2 port Copyright (c) 1990, 1991, Raymond Chen, Kai Uwe Rommel\n" |
559 |
"Version 5 port Copyright (c) 1994-2002, Andreas Kaiser, Ilya Zakharevich\n"); |
560 |
#endif |
561 |
-#ifdef atarist |
562 |
- PerlIO_printf(PerlIO_stdout(), |
563 |
- "atariST series port, ++jrb bammi@×××××××.com\n"); |
564 |
-#endif |
565 |
#ifdef __BEOS__ |
566 |
PerlIO_printf(PerlIO_stdout(), |
567 |
"BeOS port Copyright Tom Spindler, 1997-1999\n"); |
568 |
--- perl-5.12.3/perl.h 2011-01-09 20:20:57.000000000 +0000 |
569 |
+++ perl-5.12.3/perl.h 2011-02-21 09:38:50.000000000 +0000 |
570 |
@@ -497,7 +497,7 @@ |
571 |
*/ |
572 |
|
573 |
/* define this once if either system, instead of cluttering up the src */ |
574 |
-#if defined(MSDOS) || defined(atarist) || defined(WIN32) || defined(NETWARE) |
575 |
+#if defined(MSDOS) || defined(WIN32) || defined(NETWARE) |
576 |
#define DOSISH 1 |
577 |
#endif |
578 |
|
579 |
--- perl-5.12.3/perlio.c 2009-04-14 23:47:25.000000000 +0000 |
580 |
+++ perl-5.12.3/perlio.c 2010-03-23 18:36:15.000000000 +0000 |
581 |
@@ -135,17 +135,6 @@ |
582 |
* This used to be contents of do_binmode in doio.c |
583 |
*/ |
584 |
#ifdef DOSISH |
585 |
-# if defined(atarist) |
586 |
- PERL_UNUSED_ARG(iotype); |
587 |
- if (!fflush(fp)) { |
588 |
- if (mode & O_BINARY) |
589 |
- ((FILE *) fp)->_flag |= _IOBIN; |
590 |
- else |
591 |
- ((FILE *) fp)->_flag &= ~_IOBIN; |
592 |
- return 1; |
593 |
- } |
594 |
- return 0; |
595 |
-# else |
596 |
dTHX; |
597 |
PERL_UNUSED_ARG(iotype); |
598 |
#ifdef NETWARE |
599 |
@@ -153,7 +142,7 @@ |
600 |
#else |
601 |
if (PerlLIO_setmode(fileno(fp), mode) != -1) { |
602 |
#endif |
603 |
-# if defined(WIN32) && defined(__BORLANDC__) |
604 |
+# if defined(WIN32) && defined(__BORLANDC__) |
605 |
/* |
606 |
* The translation mode of the stream is maintained independent |
607 |
of |
608 |
@@ -169,12 +158,11 @@ |
609 |
fp->flags |= _F_BIN; |
610 |
else |
611 |
fp->flags &= ~_F_BIN; |
612 |
-# endif |
613 |
+# endif |
614 |
return 1; |
615 |
} |
616 |
else |
617 |
return 0; |
618 |
-# endif |
619 |
#else |
620 |
# if defined(USEMYBINMODE) |
621 |
dTHX; |
622 |
--- perl-5.12.3/pp_sys.c 2011-01-09 20:20:58.000000000 +0000 |
623 |
+++ perl-5.12.3/pp_sys.c 2011-02-21 09:38:50.000000000 +0000 |
624 |
@@ -3308,14 +3308,6 @@ |
625 |
RETPUSHNO; |
626 |
} |
627 |
|
628 |
-#if defined(atarist) /* this will work with atariST. Configure will |
629 |
- make guesses for other systems. */ |
630 |
-# define FILE_base(f) ((f)->_base) |
631 |
-# define FILE_ptr(f) ((f)->_ptr) |
632 |
-# define FILE_cnt(f) ((f)->_cnt) |
633 |
-# define FILE_bufsiz(f) ((f)->_cnt + ((f)->_ptr - (f)->_base)) |
634 |
-#endif |
635 |
- |
636 |
PP(pp_fttext) |
637 |
{ |
638 |
dVAR; |
639 |
@@ -5567,30 +5559,6 @@ |
640 |
case 8: |
641 |
retval = syscall(a[0],a[1],a[2],a[3],a[4],a[5],a[6],a[7]); |
642 |
break; |
643 |
-#ifdef atarist |
644 |
- case 9: |
645 |
- retval = syscall(a[0],a[1],a[2],a[3],a[4],a[5],a[6],a[7],a[8]); |
646 |
- break; |
647 |
- case 10: |
648 |
- retval = syscall(a[0],a[1],a[2],a[3],a[4],a[5],a[6],a[7],a[8],a[9]); |
649 |
- break; |
650 |
- case 11: |
651 |
- retval = syscall(a[0],a[1],a[2],a[3],a[4],a[5],a[6],a[7],a[8],a[9], |
652 |
- a[10]); |
653 |
- break; |
654 |
- case 12: |
655 |
- retval = syscall(a[0],a[1],a[2],a[3],a[4],a[5],a[6],a[7],a[8],a[9], |
656 |
- a[10],a[11]); |
657 |
- break; |
658 |
- case 13: |
659 |
- retval = syscall(a[0],a[1],a[2],a[3],a[4],a[5],a[6],a[7],a[8],a[9], |
660 |
- a[10],a[11],a[12]); |
661 |
- break; |
662 |
- case 14: |
663 |
- retval = syscall(a[0],a[1],a[2],a[3],a[4],a[5],a[6],a[7],a[8],a[9], |
664 |
- a[10],a[11],a[12],a[13]); |
665 |
- break; |
666 |
-#endif /* atarist */ |
667 |
} |
668 |
SP = ORIGMARK; |
669 |
PUSHi(retval); |
670 |
--- perl-5.12.3/util.c 2011-01-09 20:20:58.000000000 +0000 |
671 |
+++ perl-5.12.3/util.c 2011-02-21 09:38:51.000000000 +0000 |
672 |
@@ -2545,7 +2545,7 @@ |
673 |
return PerlIO_fdopen(p[This], mode); |
674 |
} |
675 |
#else |
676 |
-#if defined(atarist) || defined(EPOC) |
677 |
+#if defined(EPOC) |
678 |
FILE *popen(); |
679 |
PerlIO * |
680 |
Perl_my_popen(pTHX_ const char *cmd, const char *mode) |
681 |
@@ -2994,7 +2994,7 @@ |
682 |
} |
683 |
#endif |
684 |
|
685 |
-#if defined(atarist) || defined(OS2) || defined(EPOC) |
686 |
+#if defined(OS2) || defined(EPOC) |
687 |
int pclose(); |
688 |
#ifdef HAS_FORK |
689 |
int /* Cannot prototype with I32 |
690 |
@@ -3111,7 +3111,7 @@ |
691 |
I32 len = 0; |
692 |
int retval; |
693 |
char *bufend; |
694 |
-#if defined(DOSISH) && !defined(OS2) && !defined(atarist) |
695 |
+#if defined(DOSISH) && !defined(OS2) |
696 |
# define SEARCH_EXTS ".bat", ".cmd", NULL |
697 |
# define MAX_EXT_LEN 4 |
698 |
#endif |
699 |
@@ -3234,28 +3234,25 @@ |
700 |
|
701 |
bufend = s + strlen(s); |
702 |
while (s < bufend) { |
703 |
-#if defined(atarist) || defined(DOSISH) |
704 |
+#if defined(DOSISH) |
705 |
for (len = 0; *s |
706 |
-# ifdef atarist |
707 |
- && *s != ',' |
708 |
-# endif |
709 |
&& *s != ';'; len++, s++) { |
710 |
if (len < sizeof tmpbuf) |
711 |
tmpbuf[len] = *s; |
712 |
} |
713 |
if (len < sizeof tmpbuf) |
714 |
tmpbuf[len] = '\0'; |
715 |
-#else /* ! (atarist || DOSISH) */ |
716 |
+#else /* ! (DOSISH) */ |
717 |
s = delimcpy(tmpbuf, tmpbuf + sizeof tmpbuf, s, bufend, |
718 |
':', |
719 |
&len); |
720 |
-#endif /* ! (atarist || DOSISH) */ |
721 |
+#endif /* ! (DOSISH) */ |
722 |
if (s < bufend) |
723 |
s++; |
724 |
if (len + 1 + strlen(scriptname) + MAX_EXT_LEN >= sizeof tmpbuf) |
725 |
continue; /* don't search dir with too-long name */ |
726 |
if (len |
727 |
-# if defined(atarist) || defined(DOSISH) |
728 |
+# if defined(DOSISH) |
729 |
&& tmpbuf[len - 1] != '/' |
730 |
&& tmpbuf[len - 1] != '\\' |
731 |
# endif |
732 |
--- perl-5.12.3/hints/freemint.sh 2011-01-09 20:20:58.000000000 +0000 |
733 |
+++ perl-5.12.3/hints/freemint.sh 2011-02-21 09:38:51.000000000 +0000 |
734 |
@@ -0,0 +1,34 @@ |
735 |
+# hints/freemint.sh |
736 |
+# |
737 |
+# talk to guido@××××××××.de if you want to change this file. |
738 |
+# Please read the README.mint file. |
739 |
+# |
740 |
+# misc stuff |
741 |
+ |
742 |
+archname="m68k-freemint" |
743 |
+ |
744 |
+cccdlflags=' '; # avoid -fPIC |
745 |
+ccdlflags="-Wl,-whole-archive -lgcc -lpthread -Wl,-no-whole-archive" |
746 |
+ |
747 |
+# libs |
748 |
+libpth="$prefix/lib /usr/local/lib /usr/lib" |
749 |
+glibpth="$libpth" |
750 |
+xlibpth="$libpth" |
751 |
+ |
752 |
+ccflags="$ccflags -D_GNU_SOURCE" |
753 |
+libswanted='m dld' |
754 |
+dl_src='dl_dld.xs' |
755 |
+dlext='o' |
756 |
+lddlflags='-r' |
757 |
+ldflags='-static' |
758 |
+so='none' |
759 |
+useshrplib='false' |
760 |
+ |
761 |
+#sbrk() returns -1 (failure) somewhere in lib/unicore/mktables at |
762 |
+#around 14M, so we need to use system malloc() as our sbrk() |
763 |
+malloc_cflags='ccflags="-DUSE_PERL_SBRK -DPERL_SBRK_VIA_MALLOC $ccflags"' |
764 |
+ |
765 |
+# Locales aren't feeling well. We crash if -Ox used. |
766 |
+locale_cflags='optimize="-O0"' |
767 |
+LC_ALL=C; export LC_ALL; |
768 |
+LANG=C; export LANG; |
769 |
|
770 |
|
771 |
|
772 |
1.1 dev-lang/perl/files/perl-5.12.3-aix-soname.patch |
773 |
|
774 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/perl/files/perl-5.12.3-aix-soname.patch?rev=1.1&view=markup |
775 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/perl/files/perl-5.12.3-aix-soname.patch?rev=1.1&content-type=text/plain |
776 |
|
777 |
Index: perl-5.12.3-aix-soname.patch |
778 |
=================================================================== |
779 |
1) Match "powerpc-ibm-aix5.3.0.0-gcc" as gcc too. |
780 |
|
781 |
2) Creating shared library on aix with full soname support, following |
782 |
http://lists.gnu.org/archive/html/libtool/2011-01/msg00023.html |
783 |
http://lists.gnu.org/archive/html/libtool/2011-02/msg00000.html |
784 |
|
785 |
Once there is an agreement on that, this patch basically is designed |
786 |
for upstream perl to be applied when their soname would change anyway. |
787 |
However, there is 'strip' being used, and I don't know yet what to |
788 |
use instead in cross-aix setups with recent binutils. |
789 |
|
790 |
--- Makefile.SH |
791 |
+++ Makefile.SH |
792 |
@@ -92,12 +92,12 @@ |
793 |
;; |
794 |
aix*) |
795 |
case "$cc" in |
796 |
- gcc*) |
797 |
- shrpldflags="-shared -Wl,-H512 -Wl,-T512 -Wl,-bhalt:4 -Wl,-bM:SRE -Wl,-bE:perl.exp" |
798 |
+ *gcc*) |
799 |
+ shrpldflags="-shared -Wl,-H512 -Wl,-T512 -Wl,-bhalt:4 -Wl,-bE:perl.exp" |
800 |
case "$osvers" in |
801 |
- 3*) shrpldflags="$shrpldflags -e _nostart" |
802 |
+ 3*) shrpldflags="$shrpldflags -Wl,-bM:SRE -e _nostart" |
803 |
;; |
804 |
- *) shrpldflags="$shrpldflags -Wl,-bnoentry" |
805 |
+ *) shrpldflags="$shrpldflags -Wl,-G -Wl,-bernotok -Wl,-bnoentry" |
806 |
;; |
807 |
esac |
808 |
shrpldflags="$shrpldflags $ldflags $perllibs $cryptlib" |
809 |
@@ -105,11 +105,11 @@ |
810 |
linklibperl_nonshr='-lperl_nonshr' |
811 |
;; |
812 |
*) |
813 |
- shrpldflags="-H512 -T512 -bhalt:4 -bM:SRE -bE:perl.exp" |
814 |
+ shrpldflags="-H512 -T512 -bhalt:4 -bE:perl.exp" |
815 |
case "$osvers" in |
816 |
- 3*) shrpldflags="$shrpldflags -e _nostart" |
817 |
+ 3*) shrpldflags="$shrpldflags -bM:SRE -e _nostart" |
818 |
;; |
819 |
- *) shrpldflags="$shrpldflags -b noentry" |
820 |
+ *) shrpldflags="$shrpldflags -G -bernotok -b noentry" |
821 |
;; |
822 |
esac |
823 |
shrpldflags="$shrpldflags $ldflags $perllibs $cryptlib" |
824 |
@@ -763,11 +763,19 @@ |
825 |
!NO!SUBS! |
826 |
case "$osname" in |
827 |
aix) |
828 |
- $spitshell >>$Makefile <<'!NO!SUBS!' |
829 |
- rm -f libperl$(OBJ_EXT) |
830 |
- mv $@ libperl$(OBJ_EXT) |
831 |
- $(AR) qv $(LIBPERL) libperl$(OBJ_EXT) |
832 |
-!NO!SUBS! |
833 |
+ bits=32 |
834 |
+ if test X"$use64bitall" = Xdefine; then bits=64; fi |
835 |
+ $spitshell >>$Makefile <<!GROK!THIS! |
836 |
+ rm -f shr.imp shr.o |
837 |
+ mv \$@ shr.o |
838 |
+ strip -e shr.o |
839 |
+ ( echo '#! libperl.so.${revision}.${patchlevel}(shr.o)' \\ |
840 |
+ ; echo '# ${bits}' \\ |
841 |
+ ; grep -v '^#!' perl.exp \\ |
842 |
+ ) > shr.imp |
843 |
+ \$(AR) qv \$@ shr.imp shr.o |
844 |
+ rm -f shr.imp shr.o |
845 |
+!GROK!THIS! |
846 |
;; |
847 |
esac |
848 |
;; |