On Fri, Jun 15, 2012 at 08:22:25AM -0700, Alexander Hansen wrote:
> On 6/15/12 7:53 AM, Daniel Macks wrote:
> > Pushed to master.
> > dan
> >
> > On Fri, 15 Jun 2012 09:19:39 -0400, Jack Howarth
> > <howa...@bromo.med.uc.edu> wrote:
> > Alexander,
> >> I just noticed that the following sections of my ml.diff were never
> >> added to
> >> the future os branch just merged with trunk...
> >> diff --git a/perlmod/Fink/Services.pm b/perlmod/Fink/Services.pm
> >> index e51482c..4b8a7cc 100644
> >> --- a/perlmod/Fink/Services.pm
> >> +++ b/perlmod/Fink/Services.pm
> >> @@ -1277,7 +1277,7 @@ sub enforce_gcc {
> >> # Note: we no longer support 10.1 or 10.2-gcc3.1 in fink, we don't
> >> # specify default values for these. - my %system_gcc_default =
> >> ('10.2' => '3.3', '10.3' => '3.3', '10.4' => '4.0', '10.5' => '4.0',
> >> '10.6' => '4.2', '10.7' => '4.2');
> >> + my %system_gcc_default = ('10.2' => '3.3', '10.3' => '3.3', '10.4'
> >> => '4.0', '10.5' => '4.0', '10.6' => '4.2', '10.7' => '4.2', '10.8' =>
> >> '4.2');
> >> my %gcc_abi_default = ('2.95' => '2.95', '3.1' => '3.1', '3.3' =>
> >> '3.3', '4.0' => '3.3', '4.2' => '3.3');
> >> if (my $sw_vers = get_osx_vers_long()) {
> >> @@ -1368,7 +1369,7 @@ couldn't be determined. =cut
> >> sub get_darwin_equiv {
> >> - my %darwin_osx = ('1' => '10.0', '5' => '10.1', '6' => '10.2', '7'
> >> => '10.3', '8' => '10.4', '9' => '10.5', '10' => '10.6', '11' => '10.7');
> >> + my %darwin_osx = ('1' => '10.0', '5' => '10.1', '6' => '10.2', '7'
> >> => '10.3', '8' => '10.4', '9' => '10.5', '10' => '10.6', '11' =>
> >> '10.7', '12' => '10.8');
> >> return $darwin_osx{get_kernel_vers()};
> >> }
> >> diff --git a/perlmod/Fink/VirtPackage.pm b/perlmod/Fink/VirtPackage.pm
> >> index b4d3a8d..ca1f02d 100644
> >> --- a/perlmod/Fink/VirtPackage.pm
> >> +++ b/perlmod/Fink/VirtPackage.pm
> >> @@ -663,6 +663,11 @@ as part of the Xcode tools. MacOSX10.6.sdk
> >> MacOSX10.7.sdk
> >> );
> >> + } elsif ($osxversion == 12) {
> >> + @SDKDIRS=qw(
> >> + MacOSX10.7.sdk
> >> + MacOSX10.8.sdk
> >> + );
> >> }
> >> # Portable SDK path finder which works on 10.5 and later
> >> my $sdkpath;
> >> @@ -916,7 +921,7 @@ the successful execution of "gcc --version". )
> >> if $osxversion == 10;
> >> %expected_gcc = (
> >> 'gcc4.2' => '4.2',
> >> - ) if $osxversion == 11;
> >> + ) if $osxversion => 11;
> >> foreach my $key (sort keys %expected_gcc) {
> >> if (not exists $self->{$key} && not
> >> Fink::Status->query_package($key)) {
> >>
> >> Is there some reason that those sections were rejected from the
> >> original patch? I think at the very least
> >> we do want the changes to perlmod/Fink/VirtPackage.pm committed.
> >> Jack
> >>
>
> > --
> > Daniel Macks
> > dma...@netspace.org
> >
> >
>
> Sorry about that. I'm honestly not sure at this point where those
> changes went missing.
>
> It's much easier to do this kind of thing via pull requests from github.
>
Alexander,
You have a minor error in the addition of the corrections to fink trunk
and future os branch which...
diff --git a/perlmod/Fink/VirtPackage.pm b/perlmod/Fink/VirtPackage.pm
index 2ef5ba4..8ea193c 100644
--- a/perlmod/Fink/VirtPackage.pm
+++ b/perlmod/Fink/VirtPackage.pm
@@ -733,7 +733,6 @@ as part of the Xcode tools.
MacOSX10.6.sdk
MacOSX10.7.sdk
);
- }
} elsif ($osxversion == 12) {
@SDKDIRS=qw(
MacOSX10.7.sdk
corrects by removing the unbalanced parenthesis.
Jack
> --
> Alexander Hansen, Ph.D.
> Fink User Liaison
> My package updates: http://finkakh.wordpress.com/
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Fink-devel mailing list
Fink-devel@lists.sourceforge.net
List archive:
http://news.gmane.org/gmane.os.apple.fink.devel
Subscription management:
https://lists.sourceforge.net/lists/listinfo/fink-devel
