1diff -rc perl5.005_02.orig/Configure perl5.005_02/Configure 2*** perl5.005_02.orig/Configure Mon Jan 3 11:12:20 2000 3--- perl5.005_02/Configure Sun Nov 12 20:50:51 2000 4*************** 5*** 234,239 **** 6--- 234,240 ---- 7 nm='' 8 nroff='' 9 perl='' 10+ perllibs='' 11 pg='' 12 pmake='' 13 pr='' 14*************** 15*** 11334,11339 **** 16--- 11335,11348 ---- 17 shift 18 extensions="$*" 19 20+ : Remove libraries needed only for extensions 21+ : The appropriate ext/Foo/Makefile.PL will add them back in, if 22+ : necessary. 23+ set X `echo " $libs " | 24+ sed -e 's@ -lndbm @ @' -e 's@ -lgdbm @ @' -e 's@ -ldbm @ @' -e 's@ -ldb @ @'` 25+ shift 26+ perllibs="$*" 27+ 28 : Remove build directory name from cppstdin so it can be used from 29 : either the present location or the final installed location. 30 echo " " 31*************** 32*** 11859,11864 **** 33--- 11868,11874 ---- 34 patchlevel='$patchlevel' 35 path_sep='$path_sep' 36 perl='$perl' 37+ perllibs='$perllibs' 38 perladmin='$perladmin' 39 perlpath='$perlpath' 40 pg='$pg' 41Only in perl5.005_02: Configure.orig 42diff -rc perl5.005_02.orig/Makefile.SH perl5.005_02/Makefile.SH 43*** perl5.005_02.orig/Makefile.SH Sun Jul 19 08:06:35 1998 44--- perl5.005_02/Makefile.SH Sun Nov 12 20:50:51 2000 45*************** 46*** 150,156 **** 47 ext = \$(dynamic_ext) \$(static_ext) \$(nonxs_ext) 48 DYNALOADER = lib/auto/DynaLoader/DynaLoader\$(LIB_EXT) 49 50! libs = $libs $cryptlib 51 52 public = perl $suidperl utilities translators 53 54--- 150,156 ---- 55 ext = \$(dynamic_ext) \$(static_ext) \$(nonxs_ext) 56 DYNALOADER = lib/auto/DynaLoader/DynaLoader\$(LIB_EXT) 57 58! libs = $perllibs $cryptlib 59 60 public = perl $suidperl utilities translators 61 62Only in perl5.005_02: Makefile.SH.orig 63diff -rc perl5.005_02.orig/lib/ExtUtils/Embed.pm perl5.005_02/lib/ExtUtils/Embed.pm 64*** perl5.005_02.orig/lib/ExtUtils/Embed.pm Wed Jul 22 07:45:02 1998 65--- perl5.005_02/lib/ExtUtils/Embed.pm Sun Nov 12 20:50:51 2000 66*************** 67*** 194,200 **** 68 @path = $path ? split(/:/, $path) : @INC; 69 70 push(@potential_libs, @link_args) if scalar @link_args; 71! push(@potential_libs, $Config{libs}) if defined $std; 72 73 push(@mods, static_ext()) if $std; 74 75--- 194,200 ---- 76 @path = $path ? split(/:/, $path) : @INC; 77 78 push(@potential_libs, @link_args) if scalar @link_args; 79! push(@potential_libs, $Config{perllibs}) if defined $std; 80 81 push(@mods, static_ext()) if $std; 82 83diff -rc perl5.005_02.orig/lib/ExtUtils/Liblist.pm perl5.005_02/lib/ExtUtils/Liblist.pm 84*** perl5.005_02.orig/lib/ExtUtils/Liblist.pm Mon Jan 3 11:12:21 2000 85--- perl5.005_02/lib/ExtUtils/Liblist.pm Sun Nov 12 20:50:51 2000 86*************** 87*** 16,33 **** 88 89 sub _unix_os2_ext { 90 my($self,$potential_libs, $verbose) = @_; 91! if ($^O =~ 'os2' and $Config{libs}) { 92 # Dynamic libraries are not transitive, so we may need including 93 # the libraries linked against perl.dll again. 94 95 $potential_libs .= " " if $potential_libs; 96! $potential_libs .= $Config{libs}; 97 } 98 return ("", "", "", "") unless $potential_libs; 99 warn "Potential libraries are '$potential_libs':\n" if $verbose; 100 101 my($so) = $Config{'so'}; 102! my($libs) = $Config{'libs'}; 103 my $Config_libext = $Config{lib_ext} || ".a"; 104 105 106--- 16,33 ---- 107 108 sub _unix_os2_ext { 109 my($self,$potential_libs, $verbose) = @_; 110! if ($^O =~ 'os2' and $Config{perllibs}) { 111 # Dynamic libraries are not transitive, so we may need including 112 # the libraries linked against perl.dll again. 113 114 $potential_libs .= " " if $potential_libs; 115! $potential_libs .= $Config{perllibs}; 116 } 117 return ("", "", "", "") unless $potential_libs; 118 warn "Potential libraries are '$potential_libs':\n" if $verbose; 119 120 my($so) = $Config{'so'}; 121! my($libs) = $Config{'perllibs'}; 122 my $Config_libext = $Config{lib_ext} || ".a"; 123 124 125*************** 126*** 196,202 **** 127 my $BC = 1 if $cc =~ /^bcc/i; 128 my $GC = 1 if $cc =~ /^gcc/i; 129 my $so = $Config{'so'}; 130! my $libs = $Config{'libs'}; 131 my $libpth = $Config{'libpth'}; 132 my $libext = $Config{'lib_ext'} || ".lib"; 133 134--- 196,202 ---- 135 my $BC = 1 if $cc =~ /^bcc/i; 136 my $GC = 1 if $cc =~ /^gcc/i; 137 my $so = $Config{'so'}; 138! my $libs = $Config{'perllibs'}; 139 my $libpth = $Config{'libpth'}; 140 my $libext = $Config{'lib_ext'} || ".lib"; 141 142*************** 143*** 333,339 **** 144 $self->{CCFLAS} || $Config{'ccflags'}; 145 @crtls = ( ($dbgqual =~ m-/Debug-i ? $Config{'dbgprefix'} : '') 146 . 'PerlShr/Share' ); 147! push(@crtls, grep { not /\(/ } split /\s+/, $Config{'libs'}); 148 push(@crtls, grep { not /\(/ } split /\s+/, $Config{'libc'}); 149 # In general, we pass through the basic libraries from %Config unchanged. 150 # The one exception is that if we're building in the Perl source tree, and 151--- 333,339 ---- 152 $self->{CCFLAS} || $Config{'ccflags'}; 153 @crtls = ( ($dbgqual =~ m-/Debug-i ? $Config{'dbgprefix'} : '') 154 . 'PerlShr/Share' ); 155! push(@crtls, grep { not /\(/ } split /\s+/, $Config{'perllibs'}); 156 push(@crtls, grep { not /\(/ } split /\s+/, $Config{'libc'}); 157 # In general, we pass through the basic libraries from %Config unchanged. 158 # The one exception is that if we're building in the Perl source tree, and 159*************** 160*** 623,629 **** 161 =item * 162 163 If C<$potential_libs> is empty, the return value will be empty. 164! Otherwise, the libraries specified by C<$Config{libs}> (see Config.pm) 165 will be appended to the list of C<$potential_libs>. The libraries 166 will be searched for in the directories specified in C<$potential_libs> 167 as well as in C<$Config{libpth}>. For each library that is found, a 168--- 623,629 ---- 169 =item * 170 171 If C<$potential_libs> is empty, the return value will be empty. 172! Otherwise, the libraries specified by C<$Config{perllibs}> (see Config.pm) 173 will be appended to the list of C<$potential_libs>. The libraries 174 will be searched for in the directories specified in C<$potential_libs> 175 as well as in C<$Config{libpth}>. For each library that is found, a 176*************** 177*** 666,672 **** 178 alphanumeric characters are treated as flags. Unknown flags will be ignored. 179 180 An entry that matches C</:nodefault/i> disables the appending of default 181! libraries found in C<$Config{libs}> (this should be only needed very rarely). 182 183 An entry that matches C</:nosearch/i> disables all searching for 184 the libraries specified after it. Translation of C<-Lfoo> and 185--- 666,672 ---- 186 alphanumeric characters are treated as flags. Unknown flags will be ignored. 187 188 An entry that matches C</:nodefault/i> disables the appending of default 189! libraries found in C<$Config{perllibs}> (this should be only needed very rarely). 190 191 An entry that matches C</:nosearch/i> disables all searching for 192 the libraries specified after it. Translation of C<-Lfoo> and 193*************** 194*** 676,682 **** 195 196 An entry that matches C</:search/i> reenables searching for 197 the libraries specified after it. You can put it at the end to 198! enable searching for default libraries specified by C<$Config{libs}>. 199 200 =item * 201 202--- 676,682 ---- 203 204 An entry that matches C</:search/i> reenables searching for 205 the libraries specified after it. You can put it at the end to 206! enable searching for default libraries specified by C<$Config{perllibs}>. 207 208 =item * 209 210Only in perl5.005_02/lib/ExtUtils: Liblist.pm.orig 211diff -rc perl5.005_02.orig/lib/ExtUtils/MM_Unix.pm perl5.005_02/lib/ExtUtils/MM_Unix.pm 212*** perl5.005_02.orig/lib/ExtUtils/MM_Unix.pm Tue Jul 14 04:39:12 1998 213--- perl5.005_02/lib/ExtUtils/MM_Unix.pm Sun Nov 12 20:50:51 2000 214*************** 215*** 2281,2287 **** 216 MAP_STATIC = ", 217 join(" \\\n\t", reverse sort keys %static), " 218 219! MAP_PRELIBS = $Config::Config{libs} $Config::Config{cryptlib} 220 "; 221 222 if (defined $libperl) { 223--- 2281,2287 ---- 224 MAP_STATIC = ", 225 join(" \\\n\t", reverse sort keys %static), " 226 227! MAP_PRELIBS = $Config::Config{perllibs} $Config::Config{cryptlib} 228 "; 229 230 if (defined $libperl) { 231Only in perl5.005_02/lib/ExtUtils: MM_Unix.pm.orig 232diff -rc perl5.005_02.orig/myconfig perl5.005_02/myconfig 233*** perl5.005_02.orig/myconfig Fri Apr 3 01:20:35 1998 234--- perl5.005_02/myconfig Sun Nov 12 20:50:51 2000 235*************** 236*** 34,40 **** 237 Linker and Libraries: 238 ld='$ld', ldflags ='$ldflags' 239 libpth=$libpth 240! libs=$libs 241 libc=$libc, so=$so, useshrplib=$useshrplib, libperl=$libperl 242 Dynamic Linking: 243 dlsrc=$dlsrc, dlext=$dlext, d_dlsymun=$d_dlsymun, ccdlflags='$ccdlflags' 244--- 34,40 ---- 245 Linker and Libraries: 246 ld='$ld', ldflags ='$ldflags' 247 libpth=$libpth 248! libs=$perllibs 249 libc=$libc, so=$so, useshrplib=$useshrplib, libperl=$libperl 250 Dynamic Linking: 251 dlsrc=$dlsrc, dlext=$dlext, d_dlsymun=$d_dlsymun, ccdlflags='$ccdlflags' 252diff -rc perl5.005_02.orig/patchlevel.h perl5.005_02/patchlevel.h 253*** perl5.005_02.orig/patchlevel.h Mon Jan 3 11:12:19 2000 254--- perl5.005_02/patchlevel.h Sun Nov 12 20:50:51 2000 255*************** 256*** 40,45 **** 257--- 40,46 ---- 258 */ 259 static char *local_patches[] = { 260 NULL 261+ ,"NODB-1.0 - remove -ldb from core perl binary." 262 ,NULL 263 }; 264 265