1
diff -rc perl5.004_05.orig/Configure perl5.004_05/Configure
2
*** perl5.004_05.orig/Configure Thu Jan 6 22:05:49 2000
3
--- perl5.004_05/Configure Sun Nov 12 21:36:25 2000
20
+ : Remove libraries needed only for extensions
21
+ : The appropriate ext/Foo/Makefile.PL will add them back in, if
23
+ set X `echo " $libs " |
24
+ sed -e 's@ -lndbm @ @' -e 's@ -lgdbm @ @' -e 's@ -ldbm @ @' -e 's@ -ldb @ @'`
28
: Remove build directory name from cppstdin so it can be used from
29
: either the present location or the final installed location.
34
patchlevel='$patchlevel'
37
+ perllibs='$perllibs'
38
perladmin='$perladmin'
41
diff -rc perl5.004_05.orig/Makefile.SH perl5.004_05/Makefile.SH
42
*** perl5.004_05.orig/Makefile.SH Thu Jan 6 22:05:49 2000
43
--- perl5.004_05/Makefile.SH Sun Nov 12 21:36:25 2000
46
ext = \$(dynamic_ext) \$(static_ext)
47
DYNALOADER = lib/auto/DynaLoader/DynaLoader\$(LIB_EXT)
49
! libs = $libs $cryptlib
51
public = perl $suidperl utilities translators
54
ext = \$(dynamic_ext) \$(static_ext)
55
DYNALOADER = lib/auto/DynaLoader/DynaLoader\$(LIB_EXT)
57
! libs = $perllibs $cryptlib
59
public = perl $suidperl utilities translators
61
diff -rc perl5.004_05.orig/lib/ExtUtils/Embed.pm perl5.004_05/lib/ExtUtils/Embed.pm
62
*** perl5.004_05.orig/lib/ExtUtils/Embed.pm Fri Aug 1 15:08:44 1997
63
--- perl5.004_05/lib/ExtUtils/Embed.pm Sun Nov 12 21:36:25 2000
66
@path = $path ? split(/:/, $path) : @INC;
68
push(@potential_libs, @link_args) if scalar @link_args;
69
! push(@potential_libs, $Config{libs}) if defined $std;
71
push(@mods, static_ext()) if $std;
74
@path = $path ? split(/:/, $path) : @INC;
76
push(@potential_libs, @link_args) if scalar @link_args;
77
! push(@potential_libs, $Config{perllibs}) if defined $std;
79
push(@mods, static_ext()) if $std;
81
diff -rc perl5.004_05.orig/lib/ExtUtils/Liblist.pm perl5.004_05/lib/ExtUtils/Liblist.pm
82
*** perl5.004_05.orig/lib/ExtUtils/Liblist.pm Thu Jan 6 22:05:54 2000
83
--- perl5.004_05/lib/ExtUtils/Liblist.pm Sun Nov 12 21:45:31 2000
88
my($self,$potential_libs, $verbose) = @_;
89
! if ($^O =~ 'os2' and $Config{libs}) {
90
# Dynamic libraries are not transitive, so we may need including
91
# the libraries linked against perl.dll again.
93
$potential_libs .= " " if $potential_libs;
94
! $potential_libs .= $Config{libs};
96
return ("", "", "", "") unless $potential_libs;
97
warn "Potential libraries are '$potential_libs':\n" if $verbose;
99
my($so) = $Config{'so'};
100
! my($libs) = $Config{'libs'};
101
my $Config_libext = $Config{lib_ext} || ".a";
107
my($self,$potential_libs, $verbose) = @_;
108
! if ($^O =~ 'os2' and $Config{perllibs}) {
109
# Dynamic libraries are not transitive, so we may need including
110
# the libraries linked against perl.dll again.
112
$potential_libs .= " " if $potential_libs;
113
! $potential_libs .= $Config{perllibs};
115
return ("", "", "", "") unless $potential_libs;
116
warn "Potential libraries are '$potential_libs':\n" if $verbose;
118
my($so) = $Config{'so'};
119
! my($libs) = $Config{'perllibs'};
120
my $Config_libext = $Config{lib_ext} || ".a";
125
my $BC = 1 if $cc =~ /^bcc/i;
126
my $GC = 1 if $cc =~ /^gcc/i;
127
my $so = $Config{'so'};
128
! my $libs = $Config{'libs'};
129
my $libpth = $Config{'libpth'};
130
my $libext = $Config{'lib_ext'} || ".lib";
133
my $BC = 1 if $cc =~ /^bcc/i;
134
my $GC = 1 if $cc =~ /^gcc/i;
135
my $so = $Config{'so'};
136
! my $libs = $Config{'perllibs'};
137
my $libpth = $Config{'libpth'};
138
my $libext = $Config{'lib_ext'} || ".lib";
144
If C<$potential_libs> is empty, the return value will be empty.
145
! Otherwise, the libraries specified by C<$Config{libs}> (see Config.pm)
146
will be appended to the list of C<$potential_libs>. The libraries
147
will be searched for in the directories specified in C<$potential_libs>
148
as well as in C<$Config{libpth}>. For each library that is found, a
152
If C<$potential_libs> is empty, the return value will be empty.
153
! Otherwise, the libraries specified by C<$Config{perllibs}> (see Config.pm)
154
will be appended to the list of C<$potential_libs>. The libraries
155
will be searched for in the directories specified in C<$potential_libs>
156
as well as in C<$Config{libpth}>. For each library that is found, a
157
diff -rc perl5.004_05.orig/lib/ExtUtils/MM_Unix.pm perl5.004_05/lib/ExtUtils/MM_Unix.pm
158
*** perl5.004_05.orig/lib/ExtUtils/MM_Unix.pm Thu Jan 6 22:05:54 2000
159
--- perl5.004_05/lib/ExtUtils/MM_Unix.pm Sun Nov 12 21:36:25 2000
163
join(" \\\n\t", reverse sort keys %static), "
165
! MAP_PRELIBS = $Config::Config{libs} $Config::Config{cryptlib}
168
if (defined $libperl) {
171
join(" \\\n\t", reverse sort keys %static), "
173
! MAP_PRELIBS = $Config::Config{perllibs} $Config::Config{cryptlib}
176
if (defined $libperl) {
177
diff -rc perl5.004_05.orig/myconfig perl5.004_05/myconfig
178
*** perl5.004_05.orig/myconfig Thu Jan 6 22:05:55 2000
179
--- perl5.004_05/myconfig Sun Nov 12 21:43:54 2000
182
Linker and Libraries:
183
ld='$ld', ldflags ='$ldflags'
187
useshrplib=$useshrplib, libperl=$libperl
190
Linker and Libraries:
191
ld='$ld', ldflags ='$ldflags'
195
useshrplib=$useshrplib, libperl=$libperl
197
diff -rc perl5.004_05.orig/patchlevel.h perl5.004_05/patchlevel.h
198
*** perl5.004_05.orig/patchlevel.h Thu Jan 6 22:05:48 2000
199
--- perl5.004_05/patchlevel.h Sun Nov 12 21:36:25 2000
203
/* The following line and terminating '};' are read by perlbug.PL. Don't alter. */
204
static char *local_patches[] = {
206
+ ,"NODB-1.0 - remove -ldb from core perl binary."