Debian Codegraph @

lang/perl/BerkeleyDB/patches/5.6.0

raw
1 diff -cr perl-5.6.0.orig/Configure perl-5.6.0/Configure
2 *** perl-5.6.0.orig/Configure Wed Mar 22 20:36:37 2000
3 --- perl-5.6.0/Configure Sun Sep 17 23:40:15 2000
4 ***************
5 *** 217,222 ****
6 --- 217,223 ----
7 nm=''
8 nroff=''
9 perl=''
10 + perllibs=''
11 pg=''
12 pmake=''
13 pr=''
14 ***************
15 *** 14971,14976 ****
16 --- 14972,14985 ----
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 *** 15640,15645 ****
33 --- 15649,15655 ----
34 path_sep='$path_sep'
35 perl5='$perl5'
36 perl='$perl'
37 + perllibs='$perllibs'
38 perladmin='$perladmin'
39 perlpath='$perlpath'
40 pg='$pg'
41 diff -cr perl-5.6.0.orig/Makefile.SH perl-5.6.0/Makefile.SH
42 *** perl-5.6.0.orig/Makefile.SH Sat Mar 11 16:05:24 2000
43 --- perl-5.6.0/Makefile.SH Sun Sep 17 23:40:15 2000
44 ***************
45 *** 70,76 ****
46 *) shrpldflags="$shrpldflags -b noentry"
47 ;;
48 esac
49 ! shrpldflags="$shrpldflags $ldflags $libs $cryptlib"
50 linklibperl="-L $archlibexp/CORE -L `pwd | sed 's/\/UU$//'` -lperl"
51 ;;
52 hpux*)
53 --- 70,76 ----
54 *) shrpldflags="$shrpldflags -b noentry"
55 ;;
56 esac
57 ! shrpldflags="$shrpldflags $ldflags $perllibs $cryptlib"
58 linklibperl="-L $archlibexp/CORE -L `pwd | sed 's/\/UU$//'` -lperl"
59 ;;
60 hpux*)
61 ***************
62 *** 176,182 ****
63 ext = \$(dynamic_ext) \$(static_ext) \$(nonxs_ext)
64 DYNALOADER = lib/auto/DynaLoader/DynaLoader\$(LIB_EXT)
65
66 ! libs = $libs $cryptlib
67
68 public = perl $suidperl utilities translators
69
70 --- 176,182 ----
71 ext = \$(dynamic_ext) \$(static_ext) \$(nonxs_ext)
72 DYNALOADER = lib/auto/DynaLoader/DynaLoader\$(LIB_EXT)
73
74 ! libs = $perllibs $cryptlib
75
76 public = perl $suidperl utilities translators
77
78 ***************
79 *** 333,339 ****
80 case "$osname" in
81 aix)
82 $spitshell >>Makefile <<!GROK!THIS!
83 ! LIBS = $libs
84 # In AIX we need to change this for building Perl itself from
85 # its earlier definition (which is for building external
86 # extensions *after* Perl has been built and installed)
87 --- 333,339 ----
88 case "$osname" in
89 aix)
90 $spitshell >>Makefile <<!GROK!THIS!
91 ! LIBS = $perllibs
92 # In AIX we need to change this for building Perl itself from
93 # its earlier definition (which is for building external
94 # extensions *after* Perl has been built and installed)
95 diff -cr perl-5.6.0.orig/lib/ExtUtils/Embed.pm perl-5.6.0/lib/ExtUtils/Embed.pm
96 *** perl-5.6.0.orig/lib/ExtUtils/Embed.pm Sun Jan 23 12:08:32 2000
97 --- perl-5.6.0/lib/ExtUtils/Embed.pm Sun Sep 17 23:40:15 2000
98 ***************
99 *** 193,199 ****
100 @path = $path ? split(/:/, $path) : @INC;
101
102 push(@potential_libs, @link_args) if scalar @link_args;
103 ! push(@potential_libs, $Config{libs}) if defined $std;
104
105 push(@mods, static_ext()) if $std;
106
107 --- 193,199 ----
108 @path = $path ? split(/:/, $path) : @INC;
109
110 push(@potential_libs, @link_args) if scalar @link_args;
111 ! push(@potential_libs, $Config{perllibs}) if defined $std;
112
113 push(@mods, static_ext()) if $std;
114
115 diff -cr perl-5.6.0.orig/lib/ExtUtils/Liblist.pm perl-5.6.0/lib/ExtUtils/Liblist.pm
116 *** perl-5.6.0.orig/lib/ExtUtils/Liblist.pm Wed Mar 22 16:16:31 2000
117 --- perl-5.6.0/lib/ExtUtils/Liblist.pm Sun Sep 17 23:40:15 2000
118 ***************
119 *** 17,34 ****
120
121 sub _unix_os2_ext {
122 my($self,$potential_libs, $verbose) = @_;
123 ! if ($^O =~ 'os2' and $Config{libs}) {
124 # Dynamic libraries are not transitive, so we may need including
125 # the libraries linked against perl.dll again.
126
127 $potential_libs .= " " if $potential_libs;
128 ! $potential_libs .= $Config{libs};
129 }
130 return ("", "", "", "") unless $potential_libs;
131 warn "Potential libraries are '$potential_libs':\n" if $verbose;
132
133 my($so) = $Config{'so'};
134 ! my($libs) = $Config{'libs'};
135 my $Config_libext = $Config{lib_ext} || ".a";
136
137
138 --- 17,34 ----
139
140 sub _unix_os2_ext {
141 my($self,$potential_libs, $verbose) = @_;
142 ! if ($^O =~ 'os2' and $Config{perllibs}) {
143 # Dynamic libraries are not transitive, so we may need including
144 # the libraries linked against perl.dll again.
145
146 $potential_libs .= " " if $potential_libs;
147 ! $potential_libs .= $Config{perllibs};
148 }
149 return ("", "", "", "") unless $potential_libs;
150 warn "Potential libraries are '$potential_libs':\n" if $verbose;
151
152 my($so) = $Config{'so'};
153 ! my($libs) = $Config{'perllibs'};
154 my $Config_libext = $Config{lib_ext} || ".a";
155
156
157 ***************
158 *** 198,204 ****
159 my $BC = 1 if $cc =~ /^bcc/i;
160 my $GC = 1 if $cc =~ /^gcc/i;
161 my $so = $Config{'so'};
162 ! my $libs = $Config{'libs'};
163 my $libpth = $Config{'libpth'};
164 my $libext = $Config{'lib_ext'} || ".lib";
165
166 --- 198,204 ----
167 my $BC = 1 if $cc =~ /^bcc/i;
168 my $GC = 1 if $cc =~ /^gcc/i;
169 my $so = $Config{'so'};
170 ! my $libs = $Config{'perllibs'};
171 my $libpth = $Config{'libpth'};
172 my $libext = $Config{'lib_ext'} || ".lib";
173
174 ***************
175 *** 338,344 ****
176 $self->{CCFLAS} || $Config{'ccflags'};
177 @crtls = ( ($dbgqual =~ m-/Debug-i ? $Config{'dbgprefix'} : '')
178 . 'PerlShr/Share' );
179 ! push(@crtls, grep { not /\(/ } split /\s+/, $Config{'libs'});
180 push(@crtls, grep { not /\(/ } split /\s+/, $Config{'libc'});
181 # In general, we pass through the basic libraries from %Config unchanged.
182 # The one exception is that if we're building in the Perl source tree, and
183 --- 338,344 ----
184 $self->{CCFLAS} || $Config{'ccflags'};
185 @crtls = ( ($dbgqual =~ m-/Debug-i ? $Config{'dbgprefix'} : '')
186 . 'PerlShr/Share' );
187 ! push(@crtls, grep { not /\(/ } split /\s+/, $Config{'perllibs'});
188 push(@crtls, grep { not /\(/ } split /\s+/, $Config{'libc'});
189 # In general, we pass through the basic libraries from %Config unchanged.
190 # The one exception is that if we're building in the Perl source tree, and
191 ***************
192 *** 624,630 ****
193 =item *
194
195 If C<$potential_libs> is empty, the return value will be empty.
196 ! Otherwise, the libraries specified by C<$Config{libs}> (see Config.pm)
197 will be appended to the list of C<$potential_libs>. The libraries
198 will be searched for in the directories specified in C<$potential_libs>,
199 C<$Config{libpth}>, and in C<$Config{installarchlib}/CORE>.
200 --- 624,630 ----
201 =item *
202
203 If C<$potential_libs> is empty, the return value will be empty.
204 ! Otherwise, the libraries specified by C<$Config{perllibs}> (see Config.pm)
205 will be appended to the list of C<$potential_libs>. The libraries
206 will be searched for in the directories specified in C<$potential_libs>,
207 C<$Config{libpth}>, and in C<$Config{installarchlib}/CORE>.
208 ***************
209 *** 668,674 ****
210 alphanumeric characters are treated as flags. Unknown flags will be ignored.
211
212 An entry that matches C</:nodefault/i> disables the appending of default
213 ! libraries found in C<$Config{libs}> (this should be only needed very rarely).
214
215 An entry that matches C</:nosearch/i> disables all searching for
216 the libraries specified after it. Translation of C<-Lfoo> and
217 --- 668,674 ----
218 alphanumeric characters are treated as flags. Unknown flags will be ignored.
219
220 An entry that matches C</:nodefault/i> disables the appending of default
221 ! libraries found in C<$Config{perllibs}> (this should be only needed very rarely).
222
223 An entry that matches C</:nosearch/i> disables all searching for
224 the libraries specified after it. Translation of C<-Lfoo> and
225 ***************
226 *** 678,684 ****
227
228 An entry that matches C</:search/i> reenables searching for
229 the libraries specified after it. You can put it at the end to
230 ! enable searching for default libraries specified by C<$Config{libs}>.
231
232 =item *
233
234 --- 678,684 ----
235
236 An entry that matches C</:search/i> reenables searching for
237 the libraries specified after it. You can put it at the end to
238 ! enable searching for default libraries specified by C<$Config{perllibs}>.
239
240 =item *
241
242 diff -cr perl-5.6.0.orig/lib/ExtUtils/MM_Unix.pm perl-5.6.0/lib/ExtUtils/MM_Unix.pm
243 *** perl-5.6.0.orig/lib/ExtUtils/MM_Unix.pm Thu Mar 2 17:52:52 2000
244 --- perl-5.6.0/lib/ExtUtils/MM_Unix.pm Sun Sep 17 23:40:15 2000
245 ***************
246 *** 2450,2456 ****
247 MAP_STATIC = ",
248 join(" \\\n\t", reverse sort keys %static), "
249
250 ! MAP_PRELIBS = $Config::Config{libs} $Config::Config{cryptlib}
251 ";
252
253 if (defined $libperl) {
254 --- 2450,2456 ----
255 MAP_STATIC = ",
256 join(" \\\n\t", reverse sort keys %static), "
257
258 ! MAP_PRELIBS = $Config::Config{perllibs} $Config::Config{cryptlib}
259 ";
260
261 if (defined $libperl) {
262 diff -cr perl-5.6.0.orig/myconfig.SH perl-5.6.0/myconfig.SH
263 *** perl-5.6.0.orig/myconfig.SH Sat Feb 26 06:34:49 2000
264 --- perl-5.6.0/myconfig.SH Sun Sep 17 23:41:17 2000
265 ***************
266 *** 48,54 ****
267 Linker and Libraries:
268 ld='$ld', ldflags ='$ldflags'
269 libpth=$libpth
270 ! libs=$libs
271 libc=$libc, so=$so, useshrplib=$useshrplib, libperl=$libperl
272 Dynamic Linking:
273 dlsrc=$dlsrc, dlext=$dlext, d_dlsymun=$d_dlsymun, ccdlflags='$ccdlflags'
274 --- 48,54 ----
275 Linker and Libraries:
276 ld='$ld', ldflags ='$ldflags'
277 libpth=$libpth
278 ! libs=$perllibs
279 libc=$libc, so=$so, useshrplib=$useshrplib, libperl=$libperl
280 Dynamic Linking:
281 dlsrc=$dlsrc, dlext=$dlext, d_dlsymun=$d_dlsymun, ccdlflags='$ccdlflags'
282 diff -cr perl-5.6.0.orig/patchlevel.h perl-5.6.0/patchlevel.h
283 *** perl-5.6.0.orig/patchlevel.h Wed Mar 22 20:23:11 2000
284 --- perl-5.6.0/patchlevel.h Sun Sep 17 23:40:15 2000
285 ***************
286 *** 70,75 ****
287 --- 70,76 ----
288 #if !defined(PERL_PATCHLEVEL_H_IMPLICIT) && !defined(LOCAL_PATCH_COUNT)
289 static char *local_patches[] = {
290 NULL
291 + ,"NODB-1.0 - remove -ldb from core perl binary."
292 ,NULL
293 };
294