1diff -rc perl5.005_01.orig/Configure perl5.005_01/Configure 2*** perl5.005_01.orig/Configure Wed Jul 15 08:05:44 1998 3--- perl5.005_01/Configure Sun Nov 12 20:55:58 2000 4*************** 5*** 234,239 **** 6--- 234,240 ---- 7 nm='' 8 nroff='' 9 perl='' 10+ perllibs='' 11 pg='' 12 pmake='' 13 pr='' 14*************** 15*** 11279,11284 **** 16--- 11280,11293 ---- 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*** 11804,11809 **** 33--- 11813,11819 ---- 34 patchlevel='$patchlevel' 35 path_sep='$path_sep' 36 perl='$perl' 37+ perllibs='$perllibs' 38 perladmin='$perladmin' 39 perlpath='$perlpath' 40 pg='$pg' 41diff -rc perl5.005_01.orig/Makefile.SH perl5.005_01/Makefile.SH 42*** perl5.005_01.orig/Makefile.SH Sun Jul 19 08:06:35 1998 43--- perl5.005_01/Makefile.SH Sun Nov 12 20:55:58 2000 44*************** 45*** 150,156 **** 46 ext = \$(dynamic_ext) \$(static_ext) \$(nonxs_ext) 47 DYNALOADER = lib/auto/DynaLoader/DynaLoader\$(LIB_EXT) 48 49! libs = $libs $cryptlib 50 51 public = perl $suidperl utilities translators 52 53--- 150,156 ---- 54 ext = \$(dynamic_ext) \$(static_ext) \$(nonxs_ext) 55 DYNALOADER = lib/auto/DynaLoader/DynaLoader\$(LIB_EXT) 56 57! libs = $perllibs $cryptlib 58 59 public = perl $suidperl utilities translators 60 61diff -rc perl5.005_01.orig/lib/ExtUtils/Embed.pm perl5.005_01/lib/ExtUtils/Embed.pm 62*** perl5.005_01.orig/lib/ExtUtils/Embed.pm Wed Jul 22 07:45:02 1998 63--- perl5.005_01/lib/ExtUtils/Embed.pm Sun Nov 12 20:55:58 2000 64*************** 65*** 194,200 **** 66 @path = $path ? split(/:/, $path) : @INC; 67 68 push(@potential_libs, @link_args) if scalar @link_args; 69! push(@potential_libs, $Config{libs}) if defined $std; 70 71 push(@mods, static_ext()) if $std; 72 73--- 194,200 ---- 74 @path = $path ? split(/:/, $path) : @INC; 75 76 push(@potential_libs, @link_args) if scalar @link_args; 77! push(@potential_libs, $Config{perllibs}) if defined $std; 78 79 push(@mods, static_ext()) if $std; 80 81diff -rc perl5.005_01.orig/lib/ExtUtils/Liblist.pm perl5.005_01/lib/ExtUtils/Liblist.pm 82*** perl5.005_01.orig/lib/ExtUtils/Liblist.pm Wed Jul 22 07:09:42 1998 83--- perl5.005_01/lib/ExtUtils/Liblist.pm Sun Nov 12 20:55:58 2000 84*************** 85*** 16,33 **** 86 87 sub _unix_os2_ext { 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. 92 93 $potential_libs .= " " if $potential_libs; 94! $potential_libs .= $Config{libs}; 95 } 96 return ("", "", "", "") unless $potential_libs; 97 warn "Potential libraries are '$potential_libs':\n" if $verbose; 98 99 my($so) = $Config{'so'}; 100! my($libs) = $Config{'libs'}; 101 my $Config_libext = $Config{lib_ext} || ".a"; 102 103 104--- 16,33 ---- 105 106 sub _unix_os2_ext { 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. 111 112 $potential_libs .= " " if $potential_libs; 113! $potential_libs .= $Config{perllibs}; 114 } 115 return ("", "", "", "") unless $potential_libs; 116 warn "Potential libraries are '$potential_libs':\n" if $verbose; 117 118 my($so) = $Config{'so'}; 119! my($libs) = $Config{'perllibs'}; 120 my $Config_libext = $Config{lib_ext} || ".a"; 121 122 123*************** 124*** 290,296 **** 125 $self->{CCFLAS} || $Config{'ccflags'}; 126 @crtls = ( ($dbgqual =~ m-/Debug-i ? $Config{'dbgprefix'} : '') 127 . 'PerlShr/Share' ); 128! push(@crtls, grep { not /\(/ } split /\s+/, $Config{'libs'}); 129 push(@crtls, grep { not /\(/ } split /\s+/, $Config{'libc'}); 130 # In general, we pass through the basic libraries from %Config unchanged. 131 # The one exception is that if we're building in the Perl source tree, and 132--- 290,296 ---- 133 $self->{CCFLAS} || $Config{'ccflags'}; 134 @crtls = ( ($dbgqual =~ m-/Debug-i ? $Config{'dbgprefix'} : '') 135 . 'PerlShr/Share' ); 136! push(@crtls, grep { not /\(/ } split /\s+/, $Config{'perllibs'}); 137 push(@crtls, grep { not /\(/ } split /\s+/, $Config{'libc'}); 138 # In general, we pass through the basic libraries from %Config unchanged. 139 # The one exception is that if we're building in the Perl source tree, and 140*************** 141*** 598,604 **** 142 =item * 143 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 149--- 598,604 ---- 150 =item * 151 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 157diff -rc perl5.005_01.orig/lib/ExtUtils/MM_Unix.pm perl5.005_01/lib/ExtUtils/MM_Unix.pm 158*** perl5.005_01.orig/lib/ExtUtils/MM_Unix.pm Tue Jul 14 04:39:12 1998 159--- perl5.005_01/lib/ExtUtils/MM_Unix.pm Sun Nov 12 20:55:58 2000 160*************** 161*** 2281,2287 **** 162 MAP_STATIC = ", 163 join(" \\\n\t", reverse sort keys %static), " 164 165! MAP_PRELIBS = $Config::Config{libs} $Config::Config{cryptlib} 166 "; 167 168 if (defined $libperl) { 169--- 2281,2287 ---- 170 MAP_STATIC = ", 171 join(" \\\n\t", reverse sort keys %static), " 172 173! MAP_PRELIBS = $Config::Config{perllibs} $Config::Config{cryptlib} 174 "; 175 176 if (defined $libperl) { 177diff -rc perl5.005_01.orig/myconfig perl5.005_01/myconfig 178*** perl5.005_01.orig/myconfig Fri Apr 3 01:20:35 1998 179--- perl5.005_01/myconfig Sun Nov 12 20:55:58 2000 180*************** 181*** 34,40 **** 182 Linker and Libraries: 183 ld='$ld', ldflags ='$ldflags' 184 libpth=$libpth 185! libs=$libs 186 libc=$libc, so=$so, useshrplib=$useshrplib, libperl=$libperl 187 Dynamic Linking: 188 dlsrc=$dlsrc, dlext=$dlext, d_dlsymun=$d_dlsymun, ccdlflags='$ccdlflags' 189--- 34,40 ---- 190 Linker and Libraries: 191 ld='$ld', ldflags ='$ldflags' 192 libpth=$libpth 193! libs=$perllibs 194 libc=$libc, so=$so, useshrplib=$useshrplib, libperl=$libperl 195 Dynamic Linking: 196 dlsrc=$dlsrc, dlext=$dlext, d_dlsymun=$d_dlsymun, ccdlflags='$ccdlflags' 197diff -rc perl5.005_01.orig/patchlevel.h perl5.005_01/patchlevel.h 198*** perl5.005_01.orig/patchlevel.h Mon Jan 3 11:07:45 2000 199--- perl5.005_01/patchlevel.h Sun Nov 12 20:55:58 2000 200*************** 201*** 39,44 **** 202--- 39,45 ---- 203 */ 204 static char *local_patches[] = { 205 NULL 206+ ,"NODB-1.0 - remove -ldb from core perl binary." 207 ,NULL 208 }; 209 210