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: 01-Oct-2007 23:05:10
Branch: HEAD Handle: 2007100122050900
Modified files:
rpm/perl Makefile.PL.in
Log:
teach MakeMaker some Mac OS X LDFLAGS
Summary:
Revision Changes Path
1.14 +15 -1 rpm/perl/Makefile.PL.in
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/perl/Makefile.PL.in
============================================================================
$ cvs diff -u -r1.13 -r1.14 Makefile.PL.in
--- rpm/perl/Makefile.PL.in 7 Aug 2007 00:09:58 -0000 1.13
+++ rpm/perl/Makefile.PL.in 1 Oct 2007 21:05:09 -0000 1.14
@@ -20,13 +20,27 @@
RPM_Dependencies.o
);
+# teach MakeMaker some Mac OS X LDFLAGS:
+my @LDFLAGS = qw(@LDFLAGS@);
+foreach (@LDFLAGS) {
+ if (m/-arch|ppc|i386|ppc64|x86_64/) {
+ push (@ldflags, $&);
+ } elsif (m/-Wl,-search_paths_first/) {
+ push (@ldflags, $&);
+ } else {
+ push (@ldlibs, $_);
+ }
+}
+
WriteMakefile(
'NAME' => 'RPM',
'OBJECT' => join(' ', @objects),
'VERSION' => '@VERSION@',
'MAKEFILE'=> 'Makefile.perl',
- 'LIBS' => [join(' ', @ldaddp) . ' ' . join(' ', @ldadd) . ' @LDFLAGS@ @LIBS@'],
+ 'LIBS' => [join(' ', @ldaddp) . ' ' . join(' ', @ldadd) . ' ' . join(' ', @ldlibs) . ' @LIBS@'],
'CCFLAGS' => '@CFLAGS@',
+ 'LDFLAGS' => join(' ', @ldflags),
+ 'dynamic_lib' => { OTHERLDFLAGS => join(' ', @ldflags) },
'OPTIMIZE'=> '-g',
'INC' => join(' ', map { '-I@top_srcdir@/'. $_ } @libdir) . ' @CPPFLAGS@',
);
@@ .
Received on Mon Oct 1 23:05:10 2007