Update of /cvsroot/fink/fink/perlmod/Fink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17363/perlmod/Fink
Modified Files:
Tag: shlibs
PkgVersion.pm Shlibs.pm
Log Message:
Don't want the loop there...eek, added a missing Storable locking, bootstraping
now working with AddShlibDeps
Index: PkgVersion.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/PkgVersion.pm,v
retrieving revision 1.128.2.46
retrieving revision 1.128.2.47
diff -u -d -r1.128.2.46 -r1.128.2.47
--- PkgVersion.pm 9 Feb 2005 02:04:27 -0000 1.128.2.46
+++ PkgVersion.pm 9 Feb 2005 03:02:02 -0000 1.128.2.47
@@ -2350,40 +2350,40 @@
my $has_kernel_dep;
my $struct = &pkglist2lol($self->get_binary_depends());
- foreach (@$struct) {
- foreach (@$_) {
- $has_kernel_dep = 1 if /^$kernel(\Z|\s|\()/;
- ### Add shlib depends code here
- ### 1) check for 'AddShlibDeps: true' else continue
- if ($self->param_boolean("AddShlibDeps")) {
- print "Writing shared library
dependencies...\n";
-
- ### 2) get a list to replace it with
- my @filelist = ();
- my $wanted = sub {
- if (-f) {
- # print "DEBUG: file:
$File::Find::fullname\n";
- push @filelist,
$File::Find::fullname;
- }
- };
- ## Might need follow_skip but then need to
change fullname
- find({ wanted => $wanted, follow_fast => 1,
no_chdir => 1 }, "$destdir"."$basepath");
+ ### FIXME shlibs, Add shlib depends code here
+ ### 1) check for 'AddShlibDeps: true' else continue
+ if ($self->param_boolean("AddShlibDeps")) {
+ print "Writing shared library dependencies...\n";
- ### get_binary_depends above.
- my @shlib_deps =
Fink::Shlibs->get_shlibs($pkgname, @filelist);
+ ### 2) get a list to replace it with
+ my @filelist = ();
+ my $wanted = sub {
+ if (-f) {
+ # print "DEBUG: file: $File::Find::fullname\n";
+ push @filelist, $File::Find::fullname;
+ }
+ };
+ ## Might need follow_skip but then need to change fullname
+ find({ wanted => $wanted, follow_fast => 1, no_chdir => 1 },
"$destdir"."$basepath");
- ### foreach loop and push into @$struct
- ### 3) replace it in the debian control file
- foreach my $shlib_dep (@shlib_deps) {
- push @$struct, ["$shlib_dep"];
- if (Fink::Config::verbosity_level() >
2) {
- print "- Adding $shlib_dep to
'Depends' line\n";
- }
- }
+ ### get_binary_depends above.
+ my @shlib_deps = Fink::Shlibs->get_shlibs($pkgname, @filelist);
+
+ ### foreach loop and push into @$struct
+ ### 3) replace it in the debian control file
+ foreach my $shlib_dep (@shlib_deps) {
+ push @$struct, ["$shlib_dep"];
+ if (Fink::Config::verbosity_level() > 2) {
+ print "- Adding $shlib_dep to 'Depends' line\n";
}
}
}
+ foreach (@$struct) {
+ foreach (@$_) {
+ $has_kernel_dep = 1 if /^$kernel(\Z|\s|\()/;
+ }
+ }
push @$struct, ["$kernel (>= $kernel_major_version-1)"] if not
$has_kernel_dep;
$control .= "Depends: " . &lol2pkglist($struct) . "\n";
Index: Shlibs.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/Attic/Shlibs.pm,v
retrieving revision 1.1.2.37
retrieving revision 1.1.2.38
diff -u -d -r1.1.2.37 -r1.1.2.38
--- Shlibs.pm 9 Feb 2005 02:04:28 -0000 1.1.2.37
+++ Shlibs.pm 9 Feb 2005 03:02:03 -0000 1.1.2.38
@@ -543,7 +543,7 @@
mkdir_p "$basepath/var/db" or
die "Error: Could not create directory
$basepath/var/db";
}
- Storable::store($shlibs, "$basepath/var/db/$db.tmp");
+ Storable::lock_store($shlibs,
"$basepath/var/db/$db.tmp");
rename "$basepath/var/db/$db.tmp",
"$basepath/var/db/$db";
print "done.\n";
} else {
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
