You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
35 lines
1.1 KiB
35 lines
1.1 KiB
Index: Cairo-1.060/Makefile.PL |
|
--- Cairo-1.060/Makefile.PL.orig 2007-09-27 22:23:40 +0200 |
|
+++ Cairo-1.060/Makefile.PL 2008-03-15 09:28:33 +0100 |
|
@@ -48,7 +48,7 @@ |
|
} |
|
|
|
# Add this now since it's not required to generate a Makefile. |
|
-$prereqs{'Test::Number::Delta'} = 1.00; |
|
+# $prereqs{'Test::Number::Delta'} = 1.00; |
|
|
|
my $autogen_dir = 'build'; |
|
mkdir $autogen_dir unless (-d $autogen_dir); |
|
@@ -308,7 +308,9 @@ |
|
|
|
my $dep = ExtUtils::Depends->new ('Cairo'); |
|
$dep->set_inc ('-I. -I'.$autogen_dir.' '.$cairo_cfg{cflags}); |
|
-$dep->set_libs ($cairo_cfg{libs}); |
|
+my $libs = $cairo_cfg{libs}; |
|
+$libs =~ s/(.*?)\s+-lz\s+(.*?\s+-lz\s+)/$1 $2/s; |
|
+$dep->set_libs ($libs); |
|
$dep->add_xs (@xs_files); |
|
$dep->add_c ('cairo-perl-enums.c'); |
|
$dep->add_pm ('Cairo.pm' => '$(INST_LIBDIR)/Cairo.pm'); |
|
Index: Glib-1.183/Makefile.PL |
|
--- Glib-1.183/Makefile.PL.orig 2008-03-14 23:05:45 +0100 |
|
+++ Glib-1.183/Makefile.PL 2008-03-15 09:29:23 +0100 |
|
@@ -115,6 +115,8 @@ |
|
libs => '', |
|
); |
|
} |
|
+$gthreadcfg{libs} =~ s/-pthread/-lpthread/sg; |
|
+$gthreadcfg{libs} =~ s/(-lpthread)(.+)$/$2$1/s; |
|
|
|
our $glib = ExtUtils::Depends->new ('Glib'); |
|
|
|
|