1diff -rc perl5.004_03.orig/Configure perl5.004_03/Configure 2*** perl5.004_03.orig/Configure Wed Aug 13 16:09:46 1997 3--- perl5.004_03/Configure Sun Nov 12 21:56:18 2000 4*************** 5*** 188,193 **** 6--- 188,194 ---- 7 mv='' 8 nroff='' 9 perl='' 10+ perllibs='' 11 pg='' 12 pmake='' 13 pr='' 14*************** 15*** 9911,9916 **** 16--- 9912,9925 ---- 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*** 10379,10384 **** 33--- 10388,10394 ---- 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.004_03: Configure.orig 42diff -rc perl5.004_03.orig/Makefile.SH perl5.004_03/Makefile.SH 43*** perl5.004_03.orig/Makefile.SH Mon Aug 18 19:24:29 1997 44--- perl5.004_03/Makefile.SH Sun Nov 12 21:56:18 2000 45*************** 46*** 126,132 **** 47 ext = \$(dynamic_ext) \$(static_ext) 48 DYNALOADER = lib/auto/DynaLoader/DynaLoader\$(LIB_EXT) 49 50! libs = $libs $cryptlib 51 52 public = perl $suidperl utilities translators 53 54--- 126,132 ---- 55 ext = \$(dynamic_ext) \$(static_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.004_03: Makefile.SH.orig 63diff -rc perl5.004_03.orig/lib/ExtUtils/Embed.pm perl5.004_03/lib/ExtUtils/Embed.pm 64*** perl5.004_03.orig/lib/ExtUtils/Embed.pm Fri Aug 1 15:08:44 1997 65--- perl5.004_03/lib/ExtUtils/Embed.pm Sun Nov 12 21:56:18 2000 66*************** 67*** 178,184 **** 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--- 178,184 ---- 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.004_03.orig/lib/ExtUtils/Liblist.pm perl5.004_03/lib/ExtUtils/Liblist.pm 84*** perl5.004_03.orig/lib/ExtUtils/Liblist.pm Fri Aug 1 19:36:58 1997 85--- perl5.004_03/lib/ExtUtils/Liblist.pm Sun Nov 12 21:57:17 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 print STDOUT "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 print STDOUT "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*** 186,196 **** 127 my($self, $potential_libs, $verbose) = @_; 128 129 # If user did not supply a list, we punt. 130! # (caller should probably use the list in $Config{libs}) 131 return ("", "", "", "") unless $potential_libs; 132 133 my($so) = $Config{'so'}; 134! my($libs) = $Config{'libs'}; 135 my($libpth) = $Config{'libpth'}; 136 my($libext) = $Config{'lib_ext'} || ".lib"; 137 138--- 186,196 ---- 139 my($self, $potential_libs, $verbose) = @_; 140 141 # If user did not supply a list, we punt. 142! # (caller should probably use the list in $Config{perllibs}) 143 return ("", "", "", "") unless $potential_libs; 144 145 my($so) = $Config{'so'}; 146! my($libs) = $Config{'perllibs'}; 147 my($libpth) = $Config{'libpth'}; 148 my($libext) = $Config{'lib_ext'} || ".lib"; 149 150*************** 151*** 540,546 **** 152 =item * 153 154 If C<$potential_libs> is empty, the return value will be empty. 155! Otherwise, the libraries specified by C<$Config{libs}> (see Config.pm) 156 will be appended to the list of C<$potential_libs>. The libraries 157 will be searched for in the directories specified in C<$potential_libs> 158 as well as in C<$Config{libpth}>. For each library that is found, a 159--- 540,546 ---- 160 =item * 161 162 If C<$potential_libs> is empty, the return value will be empty. 163! Otherwise, the libraries specified by C<$Config{perllibs}> (see Config.pm) 164 will be appended to the list of C<$potential_libs>. The libraries 165 will be searched for in the directories specified in C<$potential_libs> 166 as well as in C<$Config{libpth}>. For each library that is found, a 167Only in perl5.004_03/lib/ExtUtils: Liblist.pm.orig 168Only in perl5.004_03/lib/ExtUtils: Liblist.pm.rej 169diff -rc perl5.004_03.orig/lib/ExtUtils/MM_Unix.pm perl5.004_03/lib/ExtUtils/MM_Unix.pm 170*** perl5.004_03.orig/lib/ExtUtils/MM_Unix.pm Mon Aug 18 19:16:12 1997 171--- perl5.004_03/lib/ExtUtils/MM_Unix.pm Sun Nov 12 21:56:19 2000 172*************** 173*** 2224,2230 **** 174 MAP_STATIC = ", 175 join(" \\\n\t", reverse sort keys %static), " 176 177! MAP_PRELIBS = $Config::Config{libs} $Config::Config{cryptlib} 178 "; 179 180 if (defined $libperl) { 181--- 2224,2230 ---- 182 MAP_STATIC = ", 183 join(" \\\n\t", reverse sort keys %static), " 184 185! MAP_PRELIBS = $Config::Config{perllibs} $Config::Config{cryptlib} 186 "; 187 188 if (defined $libperl) { 189Only in perl5.004_03/lib/ExtUtils: MM_Unix.pm.orig 190diff -rc perl5.004_03.orig/myconfig perl5.004_03/myconfig 191*** perl5.004_03.orig/myconfig Sat Dec 21 01:13:20 1996 192--- perl5.004_03/myconfig Sun Nov 12 21:56:19 2000 193*************** 194*** 35,41 **** 195 Linker and Libraries: 196 ld='$ld', ldflags ='$ldflags' 197 libpth=$libpth 198! libs=$libs 199 libc=$libc, so=$so 200 useshrplib=$useshrplib, libperl=$libperl 201 Dynamic Linking: 202--- 35,41 ---- 203 Linker and Libraries: 204 ld='$ld', ldflags ='$ldflags' 205 libpth=$libpth 206! libs=$perllibs 207 libc=$libc, so=$so 208 useshrplib=$useshrplib, libperl=$libperl 209 Dynamic Linking: 210diff -rc perl5.004_03.orig/patchlevel.h perl5.004_03/patchlevel.h 211*** perl5.004_03.orig/patchlevel.h Wed Aug 13 11:42:01 1997 212--- perl5.004_03/patchlevel.h Sun Nov 12 21:56:19 2000 213*************** 214*** 38,43 **** 215--- 38,44 ---- 216 */ 217 static char *local_patches[] = { 218 NULL 219+ ,"NODB-1.0 - remove -ldb from core perl binary." 220 ,NULL 221 }; 222 223Only in perl5.004_03: patchlevel.h.orig 224