Makefile.PL | Makefile.PL | |||
---|---|---|---|---|
skipping to change at line 33 | skipping to change at line 33 | |||
RPM_Header.o | RPM_Header.o | |||
RPM_Transaction.o | RPM_Transaction.o | |||
RPM_PackageIterator.o | RPM_PackageIterator.o | |||
RPM_Problems.o | RPM_Problems.o | |||
RPM_Spec.o | RPM_Spec.o | |||
RPM_Files.o | RPM_Files.o | |||
RPM_Dependencies.o | RPM_Dependencies.o | |||
); | ); | |||
# teach MakeMaker some Mac OS X LDFLAGS: | # teach MakeMaker some Mac OS X LDFLAGS: | |||
my @LDFLAGS = qw( -L/usr/lib6464 -lpthread -lrt -lelf $(CC CDLFLAGS) $(CCDLFLAGS) -L$(PERL_ARCHLIB)/CORE -lperl ); | my @LDFLAGS = qw( -lpthread -lrt -lelf $(CCCDLFLAGS) $(CCDLFLAGS) -L$(PERL_ARCHLIB)/CORE -lperl ); | |||
my $uname = `uname`; chomp($uname); | my $uname = `uname`; chomp($uname); | |||
foreach (@LDFLAGS) { | foreach (@LDFLAGS) { | |||
if ("$uname" eq "Darwin" && m/^(-arch|ppc|i386|ppc64|x86_64)$/) { | if ("$uname" eq "Darwin" && m/^(-arch|ppc|i386|ppc64|x86_64)$/) { | |||
push (@ldflags, $&); | push (@ldflags, $&); | |||
} elsif ("$uname" eq "Darwin" && m/-Wl,-search_paths_first/) { | } elsif ("$uname" eq "Darwin" && m/-Wl,-search_paths_first/) { | |||
push (@ldflags, $&); | push (@ldflags, $&); | |||
} else { | } else { | |||
push (@ldlibs, $_); | push (@ldlibs, $_); | |||
} | } | |||
} | } | |||
skipping to change at line 65 | skipping to change at line 65 | |||
} | } | |||
sub xs_o { | sub xs_o { | |||
my $inherited = shift->SUPER::xs_o(@_); | my $inherited = shift->SUPER::xs_o(@_); | |||
$inherited =~ s/(\.\w+\$\(OBJ_EXT\)\:\n\t.*?)\$\*\.\w+/$1\$\</g; | $inherited =~ s/(\.\w+\$\(OBJ_EXT\)\:\n\t.*?)\$\*\.\w+/$1\$\</g; | |||
$inherited; | $inherited; | |||
} | } | |||
WriteMakefile( | WriteMakefile( | |||
'NAME' => 'RPM', | 'NAME' => 'RPM', | |||
'OBJECT' => join(' ', @objects), | 'OBJECT' => join(' ', @objects), | |||
'VERSION' => '5.4.2', | 'VERSION' => '5.4.3', | |||
'MAKEFILE'=> 'Makefile.perl', | 'MAKEFILE'=> 'Makefile.perl', | |||
'CCFLAGS' => join(' ', '-g -O2 -fPIC -DPIC -Wall -W -Wpointer- arith -Wstrict-prototypes -Wmissing-prototypes -Wno-char-subscripts -Wno-un used-parameter -Wformat-security -g3 -fno-delete-null-pointer-checks -D_FOR TIFY_SOURCE=2 -fstack-protector -fexceptions -fexceptions -Wno-missing-fiel d-initializers -D_GNU_SOURCE -D_REENTRANT ', '-Wno-unused-variable', '-Wno-missing-prototypes', '-Wno-implicit', '-Wno-strict-prototypes'), | 'CCFLAGS' => join(' ', '-g -O2 -fPIC -DPIC -Wall -W -Wpointer- arith -Wstrict-prototypes -Wmissing-prototypes -Wno-char-subscripts -Wno-un used-parameter -Wformat-security -g3 -fno-delete-null-pointer-checks -D_FOR TIFY_SOURCE=2 -fstack-protector -fexceptions -fexceptions -Wno-missing-fiel d-initializers -D_GNU_SOURCE -D_REENTRANT ', '-Wno-unused- variable', '-Wno-missing-prototypes', '-Wno-implicit', '-Wno-strict-prototy pes'), | |||
'dynamic_lib' => { OTHERLDFLAGS => join(' ', @ldaddp, @lda dd, @ldlibs) }, | 'dynamic_lib' => { OTHERLDFLAGS => join(' ', @ldaddp, @lda dd, @ldlibs) }, | |||
'OPTIMIZE'=> '-g', | 'OPTIMIZE'=> '-g', | |||
'INC' => join(' ', @cppflags, map { '-I../'. $_ } @libdir) . ' -DRPM_OS_LINUX=020632 -I/usr/include/nss3 -I/usr/include/nspr4 -I/usr/include/python2.6 -I/usr/include/python2.6 ', | 'INC' => join(' ', @cppflags, map { '-I../'. $_ } @libdir) . ' -DRPM_OS_LINUX=020632 -I/usr/include/nss3 -I/usr/include/nspr4 -I${prefix}/include/tomcrypt -I${prefix}/include/tommmath -I/usr/includ e/pakchois -I${prefix}/include/db52 -I/usr/include/python2.6 -I/usr/i nclude/python2.6 -I/usr/lib64/ruby/1.8 -I/usr/lib64/ruby/1.8 -I/usr/lib64/r uby/1.8 ', | |||
'INSTALLMAN1DIR' => '${prefix}/share/man/man1', | 'INSTALLMAN1DIR' => '${prefix}/share/man/man1', | |||
'INSTALLMAN3DIR' => '${prefix}/share/man/man3', | 'INSTALLMAN3DIR' => '${prefix}/share/man/man3', | |||
); | ); | |||
End of changes. 4 change blocks. | ||||
4 lines changed or deleted | 4 lines changed or added | |||
This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/ |