[prev in list] [next in list] [prev in thread] [next in thread] 

List:       rpm-cvs
Subject:    [CVS] RPM: rpm/perl/ Makefile.PL.in
From:       "Anders F. Björklund" <afb () rpm5 ! org>
Date:       2009-01-27 20:30:21
Message-ID: 20090127203021.115B6219773 () rpm5 ! org
[Download RAW message or body]

  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Anders F. Björklund
  Root:   /v/rpm/cvs                       Email:  afb@rpm5.org
  Module: rpm                              Date:   27-Jan-2009 21:30:21
  Branch: HEAD                             Handle: 2009012720302000

  Modified files:
    rpm/perl                Makefile.PL.in

  Log:
    localize Mac OS X ldflags to Darwin uname

  Summary:
    Revision    Changes     Path
    1.26        +3  -2      rpm/perl/Makefile.PL.in
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/perl/Makefile.PL.in
  ============================================================================
  $ cvs diff -u -r1.25 -r1.26 Makefile.PL.in
  --- rpm/perl/Makefile.PL.in	24 Jan 2009 15:58:53 -0000	1.25
  +++ rpm/perl/Makefile.PL.in	27 Jan 2009 20:30:20 -0000	1.26
  @@ -31,10 +31,11 @@
   
   # teach MakeMaker some Mac OS X LDFLAGS:
   my @LDFLAGS = qw(@LDFLAGS@);
  +my $uname = `uname`; chomp($uname);
   foreach (@LDFLAGS) {
  -    if (m/^(-arch|ppc|i386|ppc64|x86_64)$/) {
  +    if ("$uname" eq "Darwin" && m/^(-arch|ppc|i386|ppc64|x86_64)$/) {
            push (@ldflags, $&);
  -    } elsif (m/-Wl,-search_paths_first/) {
  +    } elsif ("$uname" eq "Darwin" && m/-Wl,-search_paths_first/) {
            push (@ldflags, $&);
       } else {
            push (@ldlibs, $_);    
  @@ .
______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
CVS Sources Repository                                rpm-cvs@rpm5.org
[prev in list] [next in list] [prev in thread] [next in thread]