OpenPKG Specs: comparison rrdtool/rrdtool.patch

-:c93fa7cddfd1
+:347c73352636
 }
 }
 Index: bindings/perl-shared/Makefile.PL
 --- bindings/perl-shared/Makefile.PL.orig	2010-12-17 17:10:20.000000000 +0100
 +++ bindings/perl-shared/Makefile.PL	2010-12-27 08:47:23.000000000 +0100
-@@ -1,36 +1,7 @@
+@@ -1,52 +1,6 @@
 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
+-if (($Config{'osname'} eq 'MSWin32' && $ENV{'OSTYPE'} eq '')) {
--# path to librrd.so then the Makefile will be written such that RRDs.so knows
+-	WriteMakefile(
--# where to find librrd.so later on ...
+-		'NAME'         => 'RRDs',
--my $R="";
+-		'VERSION_FROM' => 'RRDs.pm',
--if ($ARGV[-1] =~ /RPATH=(\S+)/){
+-		'DEFINE'       => "-DPERLPATCHLEVEL=$Config{PATCHLEVEL} -D_CRT_SECURE_NO_WARNINGS -DWIN32",
--	pop @ARGV;
+-		'INC'          => '-I../../src/ "-IC:/Perl/lib/CORE" -I"C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\include" -I"C:\Program Files\Microsoft SDKs\Windows\v6.0A\Include"',
--	my $rp = $1;
+-		'LDDLFLAGS'    => '-dll -nologo -opt:ref,icf -ltcg -libpath:"C:\Perl\lib\CORE" -machine:X86',
--	for ($^O){
+-		'LDFLAGS'      => '-nologo -opt:ref,icf -ltcg -libpath:"C:\Perl\lib\CORE" -machine:X86',
--	        /linux/   && do{ $R = "-Wl,--rpath -Wl,$rp"};
+-		'OPTIMIZE'     => '-O2 -MD',
--	        /hpux/    && do{ $R = "+b$rp"};
+-		'LIBS'         => '"..\..\win32\Release\rrdlib.lib" "..\..\win32\Release" "C:\Perl\lib\CORE\perl514.lib" -L../../contrib/lib -L"C:\Program Files\Microsoft SDKs\Windows\v6.0A\lib" -L"C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\lib" -L"C:\Perl\lib\CORE"',
--	        /solaris/ && do{ $R = "-R$rp"};
+-		'realclean'    => {FILES => 't/demo?.rrd t/demo?.png' },
--	        /bsd/     && do{ $R = "-R$rp"};
+-		($] ge '5.005') ? (
--                /aix/     && do{ $R = "-blibpath:$rp"};
+-			'AUTHOR'   => 'Tobias Oetiker (tobi@oetiker.ch)',
+-			'ABSTRACT' => 'Round Robin Database Tool',
+-		) : ()
+-	);
+-}else{
+-	# 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"};
+-			/bsd/     && do{ $R = "-R$rp"};
+-			/aix/     && do{ $R = "-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;
+-	if ($^O eq 'darwin'){
+-        $librrd = '-lrrd';
+-	} else {
+-		$librrd = "-L../../src/.libs/ $R -lrrd";
+-	}
+-
++my $librrd = "-L../../src/.libs/ -lrrd -L$Config{prefix}/lib @l_pangocairo@";
+	WriteMakefile(
+		'NAME'         => 'RRDs',
+		'VERSION_FROM' => 'RRDs.pm', # finds $VERSION
+@@ -59,5 +13,4 @@
+		'realclean'    => {FILES => 't/demo?.rrd t/demo?.png' },
+		($^O eq 'darwin') ? ( 'LDDLFLAGS'    => "-L../../src/.libs/ $Config{lddlflags}" ) : ()
+	);
 -}
--
--# 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;
--if ($^O eq 'darwin'){
--        $librrd = '-lrrd';
--}
--else {
--        $librrd = "-L../../src/.libs/ $R -lrrd";
--}
-+my $librrd = "-L../../src/.libs/ -lrrd -L$Config{prefix}/lib -lxml2 -lz -liconv -lm -lsocket -lnsl -lpangocairo -lpango -lcairo -lpangoft2 -lglib2 -lintl -lgobject2 -lgmodule2 -lpcre -lpixman-1 -lfontconfig -lexpat -lfreetype -lpng -lz -lpango -lm -lfontconfig -lexpat -lgobject2 -lgmodule2 -lglib2 -lintl -liconv -lpcre -lfreetype -lart_lgpl";
-WriteMakefile(
-'NAME'         => 'RRDs',
 Index: bindings/python/setup.py
 --- bindings/python/setup.py.orig	2008-03-15 11:39:48.000000000 +0100
 +++ bindings/python/setup.py	2010-12-27 08:45:34.000000000 +0100
 @@ -47,7 +47,7 @@
 Extension(
 "rrdtoolmodule",
 ["rrdtoolmodule.c"],
 -            libraries=['rrd'],
-+            libraries=['rrd', 'freetype', 'art_lgpl', 'png', 'z'],
++            libraries=['rrd', 'freetype', 'png', 'z'],
 library_dirs=[library_dir],
 include_dirs=[include_dir],
 )
 Index: configure
 --- configure.orig	2010-12-26 20:51:06.000000000 +0100
 +++ configure	2010-12-27 08:45:34.000000000 +0100
-@@ -24785,13 +24785,13 @@
+@@ -25560,7 +25560,7 @@
+$as_echo_n "(cached) " >&6
+else
+ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lpangocairo-1.0  $LIBS"
++LIBS="-lpangocairo  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+@@ -25749,7 +25749,7 @@
+fi
+if test "x$ac_cv_header_pango_pango_h" = x""yes; then
+-  LIBS="-lpangocairo-1.0 ${LIBS}";EX_CHECK_STATE=YES
++  LIBS="-lpangocairo ${LIBS}";EX_CHECK_STATE=YES
+fi
+@@ -25812,7 +25812,7 @@
+$as_echo_n "(cached) " >&6
+else
+ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lpangocairo-1.0  $LIBS"
++LIBS="-lpangocairo  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+@@ -26100,13 +26100,13 @@
 if test "x""" != "x"; then
 CPPFLAGS="$CPPFLAGS -I"""
 fi
 -  { $as_echo "$as_me:$LINENO: checking for glib_check_version in -lglib-2.0" >&5
 -$as_echo_n "checking for glib_check_version in -lglib-2.0... " >&6; }
 -LIBS="-lglib-2.0  $LIBS"
 +LIBS="-lglib2  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
-@@ -24980,7 +24980,7 @@
+@@ -26295,7 +26295,7 @@
 fi
 if test "x$ac_cv_header_glib_h" = x""yes; then
 -  LIBS="-lglib-2.0 ${LIBS}";EX_CHECK_STATE=YES
 +  LIBS="-lglib2 ${LIBS}";EX_CHECK_STATE=YES
 fi
-@@ -25043,7 +25043,7 @@
+@@ -26358,7 +26358,7 @@
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lglib-2.0  $LIBS"
 +LIBS="-lglib2  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
-@@ -25335,7 +25335,7 @@
+@@ -29709,9 +29709,9 @@
-$as_echo_n "(cached) " >&6
-else
-ac_check_lib_save_LIBS=$LIBS
--LIBS="-lpangocairo-1.0  $LIBS"
-+LIBS="-lpangocairo  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-@@ -25524,7 +25524,7 @@
-fi
-if test "x$ac_cv_header_pango_pango_h" = x""yes; then
--  LIBS="-lpangocairo-1.0 ${LIBS}";EX_CHECK_STATE=YES
-+  LIBS="-lpangocairo ${LIBS}";EX_CHECK_STATE=YES
-fi
-@@ -25587,7 +25587,7 @@
-$as_echo_n "(cached) " >&6
-else
-ac_check_lib_save_LIBS=$LIBS
--LIBS="-lpangocairo-1.0  $LIBS"
-+LIBS="-lpangocairo  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-@@ -28938,9 +28938,9 @@
 $as_echo_n "checking for headers required to compile python extensions... " >&6; }
 py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
 py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
 -PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
 +PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION} -I${py_prefix}/include/python"
 save_CPPFLAGS="$CPPFLAGS"
 Index: src/rrd_daemon.c
 --- src/rrd_daemon.c.orig	2010-12-21 17:06:32.000000000 +0100
 +++ src/rrd_daemon.c	2010-12-27 08:45:34.000000000 +0100
-@@ -113,7 +113,7 @@
+@@ -105,7 +105,7 @@
 #include <tcpd.h>
 #endif /* HAVE_LIBWRAP */
 -#include <glib-2.0/glib.h>
 +#include <glib2/glib.h>
 #define RRDD_LOG(severity, ...) \
 Index: src/rrd_open.c
 --- src/rrd_open.c.orig	2010-12-26 20:24:48.000000000 +0100
 +++ src/rrd_open.c	2010-12-27 08:45:34.000000000 +0100
-@@ -265,7 +265,7 @@
+@@ -296,7 +296,7 @@
 #endif
 if (rdwr & RRD_CREAT)
 goto out_done;
 -#ifdef USE_MADVISE
 +#if defined(USE_MADVISE) && defined(MADV_WILLNEED) && defined(MADV_SEQUENTIAL) && defined(MADV_RANDOM)
 if (rdwr & RRD_COPY) {
 /* We will read everything in a moment (copying) */
 madvise(data, rrd_file->file_len, MADV_WILLNEED );
-@@ -300,7 +300,7 @@
+@@ -331,7 +331,7 @@
 rrd->stat_head->version);
 goto out_nullify_head;
 }
 -#if defined USE_MADVISE
 +#if defined(USE_MADVISE) && defined(MADV_WILLNEED)
 /* the ds_def will be needed soonish, so hint accordingly */
 madvise(data + PAGE_START(offset),
 sizeof(ds_def_t) * rrd->stat_head->ds_cnt, MADV_WILLNEED);
-@@ -308,7 +308,7 @@
+@@ -339,7 +339,7 @@
 __rrd_read(rrd->ds_def, ds_def_t,
 rrd->stat_head->ds_cnt);
 -#if defined USE_MADVISE
 +#if defined(USE_MADVISE) && defined(MADV_WILLNEED)
 /* the rra_def will be needed soonish, so hint accordingly */
 madvise(data + PAGE_START(offset),
 sizeof(rra_def_t) * rrd->stat_head->rra_cnt, MADV_WILLNEED);
-@@ -323,7 +323,7 @@
+@@ -354,7 +354,7 @@
 rrd_set_error("live_head_t malloc");
 goto out_close;
 }
 -#if defined USE_MADVISE
 +#if defined(USE_MADVISE) && defined(MADV_WILLNEED)
 /* the live_head will be needed soonish, so hint accordingly */
 madvise(data + PAGE_START(offset), sizeof(time_t), MADV_WILLNEED);
 #endif
-@@ -333,7 +333,7 @@
+@@ -364,7 +364,7 @@
 rrd->live_head->last_up = *rrd->legacy_last_up;
 rrd->live_head->last_up_usec = 0;
 } else {
 -#if defined USE_MADVISE
 +#if defined(USE_MADVISE) && defined(MADV_WILLNEED)
 /* the live_head will be needed soonish, so hint accordingly */
 madvise(data + PAGE_START(offset),
 sizeof(live_head_t), MADV_WILLNEED);
-@@ -504,7 +504,7 @@
+@@ -535,7 +535,7 @@
 + rrd->rra_ptr[i].cur_row
 * rrd->stat_head->ds_cnt * sizeof(rrd_value_t));
 if (active_block > dontneed_start) {
 -#ifdef USE_MADVISE
 +#if defined(USE_MADVISE) && defined(MADV_DONTNEED)
 madvise(rrd_simple_file->file_start + dontneed_start,
 active_block - dontneed_start - 1, MADV_DONTNEED);
 #endif
-@@ -529,7 +529,7 @@
+@@ -560,7 +560,7 @@
 }
 if (dontneed_start < rrd_file->file_len) {
 -#ifdef USE_MADVISE
 +#if defined(USE_MADVISE) && defined(MADV_DONTNEED)

OpenPKG Specs / file comparison

comparison: rrdtool/rrdtool.patch

rrdtool/rrdtool.patch