Update of /cvsroot/fink/fink/perlmod/Fink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14947
Modified Files:
VirtPackage.pm ChangeLog
Log Message:
Only assign cctools_single_module version string if it was found to
avoid undef-string-in-concat warning if not found.
Index: VirtPackage.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/VirtPackage.pm,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- VirtPackage.pm 6 Sep 2004 17:55:02 -0000 1.54
+++ VirtPackage.pm 9 Sep 2004 10:40:22 -0000 1.55
@@ -356,6 +356,7 @@
# create dummy object for cctools-single-module, if supported
print STDERR "- checking for cctools -single_module support:\n" if
($options{debug});
+ undef $cctools_single_module;
if (-x "/usr/bin/cc" and my $cctestfile = POSIX::tmpnam() and -x
"/usr/bin/touch") {
system("/usr/bin/touch ${cctestfile}.c");
my $command = "/usr/bin/cc -o ${cctestfile}.dylib ${cctestfile}.c
-dynamiclib -single_module >/dev/null 2>\&1";
@@ -365,7 +366,6 @@
$cctools_single_module = '1.0';
} else {
print STDERR "failed\n" if ($options{debug});
- $cctools_single_module = undef;
}
unlink($cctestfile);
unlink("${cctestfile}.c");
@@ -374,8 +374,6 @@
$hash = {};
$hash->{package} = "cctools-single-module";
- $hash->{status} = STATUS_PRESENT;
- $hash->{version} = $cctools_single_module."-1";
$hash->{description} = "[virtual package, your dev tools support
-single_module]";
$hash->{homepage} =
"http://fink.sourceforge.net/faq/usage-general.php#virtpackage";;
$hash->{compilescript} = $compile_script;
@@ -392,7 +390,10 @@
(free registration required)
END
- if (not $cctools_single_module) {
+ if ($cctools_single_module) {
+ $hash->{status} = STATUS_PRESENT;
+ $hash->{version} = $cctools_single_module."-1";
+ } else {
$hash->{status} = STATUS_ABSENT;
if ($cctools_version) {
$hash->{version} = $cctools_version;
Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.701
retrieving revision 1.702
diff -u -d -r1.701 -r1.702
--- ChangeLog 6 Sep 2004 17:55:02 -0000 1.701
+++ ChangeLog 9 Sep 2004 10:40:22 -0000 1.702
@@ -1,3 +1,7 @@
+2004-09-09 Daniel Macks <[EMAIL PROTECTED]>
+
+ * VirtPackage.pm: only set cctools_single_module version if it exists.
+
2004-09-06 Benjamin Reed <[EMAIL PROTECTED]>
* PkgVersion.pm, VirtPackage.pm: Some tweaks to the way
-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=5047&alloc_id=10808&op=click
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits
