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.
124 lines
3.9 KiB
124 lines
3.9 KiB
Index: bindings/perl-shared/Makefile.PL |
|
--- bindings/perl-shared/Makefile.PL.orig 2006-07-14 14:11:26 +0200 |
|
+++ bindings/perl-shared/Makefile.PL 2006-07-14 17:52:24 +0200 |
|
@@ -1,30 +1,8 @@ |
|
use ExtUtils::MakeMaker; |
|
use Config; |
|
-# See lib/ExtUtils/MakeMaker.pm for details of how to influence |
|
-# the contents of the Makefile that is written. |
|
- |
|
-# if the last argument when calling Makefile.PL is RPATH=/... and ... is the |
|
-# path to librrd.so then the Makefile will be written such that RRDs.so knows |
|
-# where to find librrd.so later on ... |
|
-my $R=""; |
|
-if ($ARGV[-1] =~ /RPATH=(\S+)/){ |
|
- pop @ARGV; |
|
- my $rp = $1; |
|
- for ($^O){ |
|
- /linux/ && do{ $R = "-Wl,--rpath -Wl,$rp"}; |
|
- /hpux/ && do{ $R = "+b$rp"}; |
|
- /solaris/ && do{ $R = "-R$rp"}; |
|
- /aix/ && do{ $R = "-Wl,-blibpath:$rp"}; |
|
- } |
|
-} |
|
- |
|
-# darwin works without this because librrd contains its |
|
-# install_name which will includes the final location of the |
|
-# library after it is installed. This install_name gets transfered |
|
-# to the perl shared object. |
|
- |
|
-my $librrd = "-L../../src/.libs/ $R -lrrd"; |
|
|
|
+my $librrd = "-L../../src/.libs/ -lrrd -L$Config{prefix}/lib -lfreetype -lpng -lz -lart_lgpl"; |
|
+ |
|
WriteMakefile( |
|
'NAME' => 'RRDs', |
|
'VERSION_FROM' => 'RRDs.pm', # finds $VERSION |
|
Index: RRDTool-OO-0.17/lib/RRDTool/OO.pm |
|
--- RRDTool-OO-0.17/lib/RRDTool/OO.pm.orig 2005-08-12 07:21:40 +0200 |
|
+++ RRDTool-OO-0.17/lib/RRDTool/OO.pm 2006-05-14 20:59:44 +0200 |
|
@@ -5,7 +5,6 @@ |
|
use warnings; |
|
use Carp; |
|
use RRDs; |
|
-use Log::Log4perl qw(:easy); |
|
|
|
our $VERSION = '0.13'; |
|
|
|
@@ -158,7 +157,7 @@ |
|
# Check if we got all mandatory parameters |
|
for(@{$ref->{mandatory}}) { |
|
if(! exists $options_hash{$_}) { |
|
- Log::Log4perl->get_logger("")->logcroak( |
|
+ croak( |
|
"Mandatory parameter '$_' not set " . |
|
"in $method() (@{[%mandatory]}) (@$options)"); |
|
} |
|
@@ -169,7 +168,7 @@ |
|
for(keys %options_hash) { |
|
if(! exists $optional{$_} and |
|
! exists $mandatory{$_}) { |
|
- Log::Log4perl->get_logger("")->logcroak( |
|
+ croak( |
|
"Illegal parameter '$_' in $method()"); |
|
} |
|
} |
|
Index: RRDTool-OO-0.17/Makefile.PL |
|
--- RRDTool-OO-0.17.orig/Makefile.PL 2006-09-10 19:21:18 +0200 |
|
+++ RRDTool-OO-0.17/Makefile.PL 2006-09-11 07:36:14 +0200 |
|
@@ -2,55 +2,12 @@ |
|
use ExtUtils::MakeMaker; |
|
use File::Basename; |
|
|
|
-# Check if RRDs is installed |
|
-my $v = rrdtool_version(); |
|
-#print "v=$v\n"; |
|
- |
|
-eval { require RRDs; }; |
|
- |
|
- # (1) libcgi is missing on most Linux/FreeBSD systems, and we |
|
- # don't need it anyway. |
|
- # (2) as of rrdtool-1.2.11, tcl libs didn't compile, so let's |
|
- # leave them out. |
|
-my $CONFIGURE_OPTS = "--prefix=/usr --disable-tcl --disable-rrdcgi"; |
|
- |
|
-my $DIST_URL = |
|
-"http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/rrdtool.tar.gz"; |
|
- |
|
-if($@ or !$v or $v < 1.002011) { |
|
- print <<EOT; |
|
-This module requires rrdtool 1.2.x and the RRDs module to be |
|
-installed. They are available in the rrdtool distribution: |
|
- $DIST_URL |
|
-EOT |
|
- |
|
- $| = 1; |
|
- print "Do you want me to install it for you right now ([y]/n)?"; |
|
- my $in = <>; |
|
- chomp $in; |
|
- if($in =~ /^\s*$/ or $in =~ /y/i) { |
|
- if($> != 0) { |
|
- die "\nYou need to be root to do this.\n"; |
|
- } |
|
- eval { install_RRDs() }; |
|
- if($@) { |
|
- print $@; |
|
- note(); |
|
- exit 0; |
|
- } |
|
- } else { |
|
- note(); |
|
- exit 0; |
|
- } |
|
-} |
|
- |
|
# See lib/ExtUtils/MakeMaker.pm for details of how to influence |
|
# the contents of the Makefile that is written. |
|
WriteMakefile( |
|
NAME => 'RRDTool::OO', |
|
VERSION_FROM => 'lib/RRDTool/OO.pm', # finds $VERSION |
|
PREREQ_PM => { |
|
- Log::Log4perl => '0.40', |
|
RRDs => 0, |
|
}, # e.g., Module::Name => 1.1 |
|
($] >= 5.005 ? ## Add these new keywords supported since 5.005
|
|
|