]>
Commit | Line | Data |
---|---|---|
2daa4fb8 AM |
1 | diff -urN perl-5.10.0.org/Makefile.micro perl-5.10.0/Makefile.micro |
2 | --- perl-5.10.0.org/Makefile.micro 2007-12-18 11:47:07.000000000 +0100 | |
3 | +++ perl-5.10.0/Makefile.micro 2008-01-09 14:22:14.801222180 +0100 | |
4 | @@ -39,6 +39,12 @@ | |
5 | ||
6 | distclean: clean | |
7 | ||
8 | +# not really autoconfigured variables (PLD hack, requires patched uconfig.sh) | |
9 | +NRACV = archlib=$(archlib) archlibexp=$(archlibexp) privlib=$(privlib) \ | |
10 | + privlibexp=$(privlibexp) archname=$(archname) osname=$(osname) \ | |
11 | + bin=$(bin) scriptdir=$(scriptdir) scriptdirexp=$(scriptdirexp) \ | |
12 | + usemallocwrap=$(usemallocwrap) | |
13 | + | |
14 | # The microconfiguration. | |
15 | ||
16 | # Cannot use $$ in the command line itself, so using var expansion instead. | |
17 | @@ -47,7 +53,9 @@ | |
18 | $(PERL) -MConfig -pi -e "s/^((?:short|int|long(?:dbl|long)?|ptr|double|[iun]v|u?quad|[iu]\d+|fpos|lseek)(?:size|type)|byteorder|d_quad|quadkind|use64.+)=.*/\\1='"$(Config)"'/g" uconfig.shx | |
19 | ||
20 | regen_uconfig uconfig.h: uconfig.sh | |
21 | - $(ENV) CONFIG_SH=uconfig.sh CONFIG_H=uconfig.h sh ./config_h.SH | |
22 | + $(ENV) CONFIG_SH=uconfig.sh CONFIG_H=uconfig.h $(NRACV) sh ./config_h.SH | |
23 | + | |
24 | +uconfig.h: regen_uconfig | |
25 | ||
26 | # Do not regenerate perly.c and perly.h. | |
27 | ||
28 | diff -urN perl-5.10.0.org/uconfig.sh perl-5.10.0/uconfig.sh | |
29 | --- perl-5.10.0.org/uconfig.sh 2007-12-18 11:47:08.000000000 +0100 | |
30 | +++ perl-5.10.0/uconfig.sh 2008-01-09 14:21:01.327533497 +0100 | |
31 | @@ -5,12 +5,7 @@ | |
260b9147 | 32 | afsroot='/afs' |
33 | alignbytes='4' | |
2daa4fb8 AM |
34 | aphostname='/bin/hostname' |
35 | -archlib='/usr/local/lib/perl5/5.10/unknown' | |
36 | -archlibexp='/usr/local/lib/perl5/5.10/unknown' | |
260b9147 | 37 | -archname='unknown' |
38 | asctime_r_proto='0' | |
39 | -bin='/usr/local/bin' | |
2daa4fb8 | 40 | -binexp='/usr/local/bin' |
260b9147 | 41 | byteorder='1234' |
42 | castflags='0' | |
2daa4fb8 AM |
43 | cf_by='root@localhost' |
44 | @@ -43,7 +38,7 @@ | |
260b9147 | 45 | d_accessx='undef' |
46 | d_aintl='undef' | |
47 | d_alarm='undef' | |
48 | -d_archlib='undef' | |
49 | +d_archlib='define' | |
50 | d_asctime_r='undef' | |
51 | d_atolf='undef' | |
52 | d_atoll='undef' | |
2daa4fb8 AM |
53 | @@ -221,7 +216,7 @@ |
54 | d_libm_lib_version='undef' | |
cb744251 JB |
55 | d_link='undef' |
56 | d_localtime_r='undef' | |
2daa4fb8 | 57 | -d_localtime_r_needs_tzset='undef' |
cb744251 JB |
58 | +d_localtime_r_needs_tzset='define' |
59 | d_locconv='undef' | |
60 | d_lockf='undef' | |
61 | d_longdbl='undef' | |
2daa4fb8 AM |
62 | @@ -639,14 +634,10 @@ |
63 | old_pthread_create_joinable='' | |
260b9147 | 64 | optimize='-O2' |
65 | orderlib='false' | |
66 | -osname='unknown' | |
2daa4fb8 AM |
67 | -osvers='unknown' |
68 | otherlibdirs=' ' | |
69 | package='perl5' | |
260b9147 | 70 | phostname='hostname' |
71 | pidtype=int | |
2daa4fb8 AM |
72 | -privlib='/usr/local/lib/perl5/5.10' |
73 | -privlibexp='/usr/local/lib/perl5/5.10' | |
260b9147 | 74 | procselfexe='' |
75 | prototype='undef' | |
76 | ptrsize='4' | |
2daa4fb8 | 77 | @@ -673,8 +664,6 @@ |
260b9147 | 78 | sPRIx64='"Lx"' |
79 | sSCNfldbl='"llf"' | |
80 | sched_yield='sched_yield()' | |
81 | -scriptdir='/usr/local/bin' | |
82 | -scriptdirexp='/usr/local/bin' | |
83 | seedfunc='srand' | |
84 | selectminbits='32' | |
85 | selecttype=int |