Debian Codegraph @

lang/perl/BerkeleyDB/patches/5.004_04

raw
1 diff -rc perl5.004_04.orig/Configure perl5.004_04/Configure
2 *** perl5.004_04.orig/Configure Fri Oct 3 18:57:39 1997
3 --- perl5.004_04/Configure Sun Nov 12 21:50:51 2000
4 ***************
5 *** 188,193 ****
6 --- 188,194 ----
7 mv=''
8 nroff=''
9 perl=''
10 + perllibs=''
11 pg=''
12 pmake=''
13 pr=''
14 ***************
15 *** 9910,9915 ****
16 --- 9911,9924 ----
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 *** 10378,10383 ****
33 --- 10387,10393 ----
34 patchlevel='$patchlevel'
35 path_sep='$path_sep'
36 perl='$perl'
37 + perllibs='$perllibs'
38 perladmin='$perladmin'
39 perlpath='$perlpath'
40 pg='$pg'
41 diff -rc perl5.004_04.orig/Makefile.SH perl5.004_04/Makefile.SH
42 *** perl5.004_04.orig/Makefile.SH Wed Oct 15 10:33:16 1997
43 --- perl5.004_04/Makefile.SH Sun Nov 12 21:50:51 2000
44 ***************
45 *** 129,135 ****
46 ext = \$(dynamic_ext) \$(static_ext)
47 DYNALOADER = lib/auto/DynaLoader/DynaLoader\$(LIB_EXT)
48
49 ! libs = $libs $cryptlib
50
51 public = perl $suidperl utilities translators
52
53 --- 129,135 ----
54 ext = \$(dynamic_ext) \$(static_ext)
55 DYNALOADER = lib/auto/DynaLoader/DynaLoader\$(LIB_EXT)
56
57 ! libs = $perllibs $cryptlib
58
59 public = perl $suidperl utilities translators
60
61 diff -rc perl5.004_04.orig/lib/ExtUtils/Embed.pm perl5.004_04/lib/ExtUtils/Embed.pm
62 *** perl5.004_04.orig/lib/ExtUtils/Embed.pm Fri Aug 1 15:08:44 1997
63 --- perl5.004_04/lib/ExtUtils/Embed.pm Sun Nov 12 21:50:51 2000
64 ***************
65 *** 178,184 ****
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 --- 178,184 ----
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
81 diff -rc perl5.004_04.orig/lib/ExtUtils/Liblist.pm perl5.004_04/lib/ExtUtils/Liblist.pm
82 *** perl5.004_04.orig/lib/ExtUtils/Liblist.pm Tue Sep 9 17:41:32 1997
83 --- perl5.004_04/lib/ExtUtils/Liblist.pm Sun Nov 12 21:51:33 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 *** 189,195 ****
125 return ("", "", "", "") unless $potential_libs;
126
127 my($so) = $Config{'so'};
128 ! my($libs) = $Config{'libs'};
129 my($libpth) = $Config{'libpth'};
130 my($libext) = $Config{'lib_ext'} || ".lib";
131
132 --- 189,195 ----
133 return ("", "", "", "") unless $potential_libs;
134
135 my($so) = $Config{'so'};
136 ! my($libs) = $Config{'perllibs'};
137 my($libpth) = $Config{'libpth'};
138 my($libext) = $Config{'lib_ext'} || ".lib";
139
140 ***************
141 *** 539,545 ****
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 --- 539,545 ----
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
157 diff -rc perl5.004_04.orig/lib/ExtUtils/MM_Unix.pm perl5.004_04/lib/ExtUtils/MM_Unix.pm
158 *** perl5.004_04.orig/lib/ExtUtils/MM_Unix.pm Wed Oct 8 14:13:51 1997
159 --- perl5.004_04/lib/ExtUtils/MM_Unix.pm Sun Nov 12 21:50:51 2000
160 ***************
161 *** 2229,2235 ****
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 --- 2229,2235 ----
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) {
177 diff -rc perl5.004_04.orig/myconfig perl5.004_04/myconfig
178 *** perl5.004_04.orig/myconfig Mon Oct 6 18:26:49 1997
179 --- perl5.004_04/myconfig Sun Nov 12 21:50:51 2000
180 ***************
181 *** 35,41 ****
182 Linker and Libraries:
183 ld='$ld', ldflags ='$ldflags'
184 libpth=$libpth
185 ! libs=$libs
186 libc=$libc, so=$so
187 useshrplib=$useshrplib, libperl=$libperl
188 Dynamic Linking:
189 --- 35,41 ----
190 Linker and Libraries:
191 ld='$ld', ldflags ='$ldflags'
192 libpth=$libpth
193 ! libs=$perllibs
194 libc=$libc, so=$so
195 useshrplib=$useshrplib, libperl=$libperl
196 Dynamic Linking:
197 diff -rc perl5.004_04.orig/patchlevel.h perl5.004_04/patchlevel.h
198 *** perl5.004_04.orig/patchlevel.h Wed Oct 15 10:55:19 1997
199 --- perl5.004_04/patchlevel.h Sun Nov 12 21:50:51 2000
200 ***************
201 *** 39,44 ****
202 --- 39,45 ----
203 /* The following line and terminating '};' are read by perlbug.PL. Don't alter. */
204 static char *local_patches[] = {
205 NULL
206 + ,"NODB-1.0 - remove -ldb from core perl binary."
207 ,NULL
208 };
209