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
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
|
diff -cr perl-5.6.0.orig/Configure perl-5.6.0/Configure
*** perl-5.6.0.orig/Configure Wed Mar 22 20:36:37 2000
--- perl-5.6.0/Configure Sun Sep 17 23:40:15 2000
***************
*** 217,222 ****
--- 217,223 ----
nm=''
nroff=''
perl=''
+ perllibs=''
pg=''
pmake=''
pr=''
***************
*** 14971,14976 ****
--- 14972,14985 ----
shift
extensions="$*"
+ : Remove libraries needed only for extensions
+ : The appropriate ext/Foo/Makefile.PL will add them back in, if
+ : necessary.
+ set X `echo " $libs " |
+ sed -e 's@ -lndbm @ @' -e 's@ -lgdbm @ @' -e 's@ -ldbm @ @' -e 's@ -ldb @ @'`
+ shift
+ perllibs="$*"
+
: Remove build directory name from cppstdin so it can be used from
: either the present location or the final installed location.
echo " "
***************
*** 15640,15645 ****
--- 15649,15655 ----
path_sep='$path_sep'
perl5='$perl5'
perl='$perl'
+ perllibs='$perllibs'
perladmin='$perladmin'
perlpath='$perlpath'
pg='$pg'
diff -cr perl-5.6.0.orig/Makefile.SH perl-5.6.0/Makefile.SH
*** perl-5.6.0.orig/Makefile.SH Sat Mar 11 16:05:24 2000
--- perl-5.6.0/Makefile.SH Sun Sep 17 23:40:15 2000
***************
*** 70,76 ****
*) shrpldflags="$shrpldflags -b noentry"
;;
esac
! shrpldflags="$shrpldflags $ldflags $libs $cryptlib"
linklibperl="-L $archlibexp/CORE -L `pwd | sed 's/\/UU$//'` -lperl"
;;
hpux*)
--- 70,76 ----
*) shrpldflags="$shrpldflags -b noentry"
;;
esac
! shrpldflags="$shrpldflags $ldflags $perllibs $cryptlib"
linklibperl="-L $archlibexp/CORE -L `pwd | sed 's/\/UU$//'` -lperl"
;;
hpux*)
***************
*** 176,182 ****
ext = \$(dynamic_ext) \$(static_ext) \$(nonxs_ext)
DYNALOADER = lib/auto/DynaLoader/DynaLoader\$(LIB_EXT)
! libs = $libs $cryptlib
public = perl $suidperl utilities translators
--- 176,182 ----
ext = \$(dynamic_ext) \$(static_ext) \$(nonxs_ext)
DYNALOADER = lib/auto/DynaLoader/DynaLoader\$(LIB_EXT)
! libs = $perllibs $cryptlib
public = perl $suidperl utilities translators
***************
*** 333,339 ****
case "$osname" in
aix)
$spitshell >>Makefile <<!GROK!THIS!
! LIBS = $libs
# In AIX we need to change this for building Perl itself from
# its earlier definition (which is for building external
# extensions *after* Perl has been built and installed)
--- 333,339 ----
case "$osname" in
aix)
$spitshell >>Makefile <<!GROK!THIS!
! LIBS = $perllibs
# In AIX we need to change this for building Perl itself from
# its earlier definition (which is for building external
# extensions *after* Perl has been built and installed)
diff -cr perl-5.6.0.orig/lib/ExtUtils/Embed.pm perl-5.6.0/lib/ExtUtils/Embed.pm
*** perl-5.6.0.orig/lib/ExtUtils/Embed.pm Sun Jan 23 12:08:32 2000
--- perl-5.6.0/lib/ExtUtils/Embed.pm Sun Sep 17 23:40:15 2000
***************
*** 193,199 ****
@path = $path ? split(/:/, $path) : @INC;
push(@potential_libs, @link_args) if scalar @link_args;
! push(@potential_libs, $Config{libs}) if defined $std;
push(@mods, static_ext()) if $std;
--- 193,199 ----
@path = $path ? split(/:/, $path) : @INC;
push(@potential_libs, @link_args) if scalar @link_args;
! push(@potential_libs, $Config{perllibs}) if defined $std;
push(@mods, static_ext()) if $std;
diff -cr perl-5.6.0.orig/lib/ExtUtils/Liblist.pm perl-5.6.0/lib/ExtUtils/Liblist.pm
*** perl-5.6.0.orig/lib/ExtUtils/Liblist.pm Wed Mar 22 16:16:31 2000
--- perl-5.6.0/lib/ExtUtils/Liblist.pm Sun Sep 17 23:40:15 2000
***************
*** 17,34 ****
sub _unix_os2_ext {
my($self,$potential_libs, $verbose) = @_;
! if ($^O =~ 'os2' and $Config{libs}) {
# Dynamic libraries are not transitive, so we may need including
# the libraries linked against perl.dll again.
$potential_libs .= " " if $potential_libs;
! $potential_libs .= $Config{libs};
}
return ("", "", "", "") unless $potential_libs;
warn "Potential libraries are '$potential_libs':\n" if $verbose;
my($so) = $Config{'so'};
! my($libs) = $Config{'libs'};
my $Config_libext = $Config{lib_ext} || ".a";
--- 17,34 ----
sub _unix_os2_ext {
my($self,$potential_libs, $verbose) = @_;
! if ($^O =~ 'os2' and $Config{perllibs}) {
# Dynamic libraries are not transitive, so we may need including
# the libraries linked against perl.dll again.
$potential_libs .= " " if $potential_libs;
! $potential_libs .= $Config{perllibs};
}
return ("", "", "", "") unless $potential_libs;
warn "Potential libraries are '$potential_libs':\n" if $verbose;
my($so) = $Config{'so'};
! my($libs) = $Config{'perllibs'};
my $Config_libext = $Config{lib_ext} || ".a";
***************
*** 198,204 ****
my $BC = 1 if $cc =~ /^bcc/i;
my $GC = 1 if $cc =~ /^gcc/i;
my $so = $Config{'so'};
! my $libs = $Config{'libs'};
my $libpth = $Config{'libpth'};
my $libext = $Config{'lib_ext'} || ".lib";
--- 198,204 ----
my $BC = 1 if $cc =~ /^bcc/i;
my $GC = 1 if $cc =~ /^gcc/i;
my $so = $Config{'so'};
! my $libs = $Config{'perllibs'};
my $libpth = $Config{'libpth'};
my $libext = $Config{'lib_ext'} || ".lib";
***************
*** 338,344 ****
$self->{CCFLAS} || $Config{'ccflags'};
@crtls = ( ($dbgqual =~ m-/Debug-i ? $Config{'dbgprefix'} : '')
. 'PerlShr/Share' );
! push(@crtls, grep { not /\(/ } split /\s+/, $Config{'libs'});
push(@crtls, grep { not /\(/ } split /\s+/, $Config{'libc'});
# In general, we pass through the basic libraries from %Config unchanged.
# The one exception is that if we're building in the Perl source tree, and
--- 338,344 ----
$self->{CCFLAS} || $Config{'ccflags'};
@crtls = ( ($dbgqual =~ m-/Debug-i ? $Config{'dbgprefix'} : '')
. 'PerlShr/Share' );
! push(@crtls, grep { not /\(/ } split /\s+/, $Config{'perllibs'});
push(@crtls, grep { not /\(/ } split /\s+/, $Config{'libc'});
# In general, we pass through the basic libraries from %Config unchanged.
# The one exception is that if we're building in the Perl source tree, and
***************
*** 624,630 ****
=item *
If C<$potential_libs> is empty, the return value will be empty.
! Otherwise, the libraries specified by C<$Config{libs}> (see Config.pm)
will be appended to the list of C<$potential_libs>. The libraries
will be searched for in the directories specified in C<$potential_libs>,
C<$Config{libpth}>, and in C<$Config{installarchlib}/CORE>.
--- 624,630 ----
=item *
If C<$potential_libs> is empty, the return value will be empty.
! Otherwise, the libraries specified by C<$Config{perllibs}> (see Config.pm)
will be appended to the list of C<$potential_libs>. The libraries
will be searched for in the directories specified in C<$potential_libs>,
C<$Config{libpth}>, and in C<$Config{installarchlib}/CORE>.
***************
*** 668,674 ****
alphanumeric characters are treated as flags. Unknown flags will be ignored.
An entry that matches C</:nodefault/i> disables the appending of default
! libraries found in C<$Config{libs}> (this should be only needed very rarely).
An entry that matches C</:nosearch/i> disables all searching for
the libraries specified after it. Translation of C<-Lfoo> and
--- 668,674 ----
alphanumeric characters are treated as flags. Unknown flags will be ignored.
An entry that matches C</:nodefault/i> disables the appending of default
! libraries found in C<$Config{perllibs}> (this should be only needed very rarely).
An entry that matches C</:nosearch/i> disables all searching for
the libraries specified after it. Translation of C<-Lfoo> and
***************
*** 678,684 ****
An entry that matches C</:search/i> reenables searching for
the libraries specified after it. You can put it at the end to
! enable searching for default libraries specified by C<$Config{libs}>.
=item *
--- 678,684 ----
An entry that matches C</:search/i> reenables searching for
the libraries specified after it. You can put it at the end to
! enable searching for default libraries specified by C<$Config{perllibs}>.
=item *
diff -cr perl-5.6.0.orig/lib/ExtUtils/MM_Unix.pm perl-5.6.0/lib/ExtUtils/MM_Unix.pm
*** perl-5.6.0.orig/lib/ExtUtils/MM_Unix.pm Thu Mar 2 17:52:52 2000
--- perl-5.6.0/lib/ExtUtils/MM_Unix.pm Sun Sep 17 23:40:15 2000
***************
*** 2450,2456 ****
MAP_STATIC = ",
join(" \\\n\t", reverse sort keys %static), "
! MAP_PRELIBS = $Config::Config{libs} $Config::Config{cryptlib}
";
if (defined $libperl) {
--- 2450,2456 ----
MAP_STATIC = ",
join(" \\\n\t", reverse sort keys %static), "
! MAP_PRELIBS = $Config::Config{perllibs} $Config::Config{cryptlib}
";
if (defined $libperl) {
diff -cr perl-5.6.0.orig/myconfig.SH perl-5.6.0/myconfig.SH
*** perl-5.6.0.orig/myconfig.SH Sat Feb 26 06:34:49 2000
--- perl-5.6.0/myconfig.SH Sun Sep 17 23:41:17 2000
***************
*** 48,54 ****
Linker and Libraries:
ld='$ld', ldflags ='$ldflags'
libpth=$libpth
! libs=$libs
libc=$libc, so=$so, useshrplib=$useshrplib, libperl=$libperl
Dynamic Linking:
dlsrc=$dlsrc, dlext=$dlext, d_dlsymun=$d_dlsymun, ccdlflags='$ccdlflags'
--- 48,54 ----
Linker and Libraries:
ld='$ld', ldflags ='$ldflags'
libpth=$libpth
! libs=$perllibs
libc=$libc, so=$so, useshrplib=$useshrplib, libperl=$libperl
Dynamic Linking:
dlsrc=$dlsrc, dlext=$dlext, d_dlsymun=$d_dlsymun, ccdlflags='$ccdlflags'
diff -cr perl-5.6.0.orig/patchlevel.h perl-5.6.0/patchlevel.h
*** perl-5.6.0.orig/patchlevel.h Wed Mar 22 20:23:11 2000
--- perl-5.6.0/patchlevel.h Sun Sep 17 23:40:15 2000
***************
*** 70,75 ****
--- 70,76 ----
#if !defined(PERL_PATCHLEVEL_H_IMPLICIT) && !defined(LOCAL_PATCH_COUNT)
static char *local_patches[] = {
NULL
+ ,"NODB-1.0 - remove -ldb from core perl binary."
,NULL
};
|
