Ticket #17015: rrdtool.diff

File rrdtool.diff, 9.4 KB (added by vinc17@…, 16 years ago)

patch (containing other patches that haven't been applied yet)

  • files/patch-configure.diff

     
     1--- configure.orig      2008-10-04 10:04:20.000000000 -0600
     2+++ configure   2008-10-26 01:33:27.000000000 -0600
     3@@ -8754,8 +8754,8 @@
     4        output_verbose_link_cmd='echo'
     5         archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
     6         module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
     7-        archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
     8-        module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
     9+        archive_expsym_cmds="sed -e 's,^\([^#]\),_\1,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
     10+        module_expsym_cmds="sed -e 's,^\([^#]\),_\1,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
     11     else
     12       case $cc_basename in
     13         xlc*)
     14@@ -11827,11 +11827,11 @@
     15       output_verbose_link_cmd='echo'
     16       archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
     17       module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
     18-      archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
     19-      module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
     20+      archive_expsym_cmds_CXX="sed -e 's,^\([^#]\),_\1,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
     21+      module_expsym_cmds_CXX="sed -e 's,^\([^#]\),_\1,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
     22       if test "$lt_cv_apple_cc_single_mod" != "yes"; then
     23         archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
     24-        archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
     25+        archive_expsym_cmds_CXX="sed -e 's,^\([^#]\),_\1,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
     26       fi
     27       else
     28       case $cc_basename in
     29@@ -15418,8 +15418,8 @@
     30        output_verbose_link_cmd='echo'
     31         archive_cmds_F77="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
     32         module_cmds_F77="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
     33-        archive_expsym_cmds_F77="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
     34-        module_expsym_cmds_F77="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
     35+        archive_expsym_cmds_F77="sed -e 's,^\([^#]\),_\1,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
     36+        module_expsym_cmds_F77="sed -e 's,^\([^#]\),_\1,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
     37     else
     38       case $cc_basename in
     39         xlc*)
     40@@ -18052,8 +18052,8 @@
     41        output_verbose_link_cmd='echo'
     42         archive_cmds_GCJ="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
     43         module_cmds_GCJ="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
     44-        archive_expsym_cmds_GCJ="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
     45-        module_expsym_cmds_GCJ="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
     46+        archive_expsym_cmds_GCJ="sed -e 's,^\([^#]\),_\1,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
     47+        module_expsym_cmds_GCJ="sed -e 's,^\([^#]\),_\1,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
     48     else
     49       case $cc_basename in
     50         xlc*)

  • files/patch-Makefile.PL.diff

     
     1--- bindings/perl-shared/Makefile.PL~   2008-03-15 10:39:48.000000000 +0000
     2+++ bindings/perl-shared/Makefile.PL    2008-09-10 13:13:07.000000000 +0000
     3@@ -23,7 +23,7 @@
     4 # library after it is installed. This install_name gets transfered
     5 # to the perl shared object.
     6 
     7-my $librrd = "-L../../src/.libs/ $R -lrrd";
     8+my $librrd = "$R -lrrd";
     9 
     10 WriteMakefile(
     11     'NAME'         => 'RRDs',
     12@@ -33,6 +33,7 @@
     13     # Perl will figure out which one is valid
     14     #'dynamic_lib'  => {'OTHERLDFLAGS' => "$librrd -lm"},
     15     'depend'       => {'RRDs.c' => "../../src/librrd.la"},
     16+    'LDDLFLAGS'    => "-L../../src/.libs/ $Config{lddlflags}",
     17     'LDFROM'       => '$(OBJECT) '.$librrd,
     18     'realclean'    => {FILES => 't/demo?.rrd t/demo?.png' }
     19 );

  • files/patch-rrd_open.c.diff

     
     1--- src/rrd_open.c.orig 2008-10-04 16:04:04.000000000 +0000
     2+++ src/rrd_open.c      2008-12-07 11:15:41.000000000 +0000
     3@@ -139,6 +139,12 @@
     4         goto out_free;
     5     }
     6 
     7+#ifdef HAVE_MMAP
     8+    if (rdwr & RRD_READWRITE) {
     9+           utime(file_name,NULL);
     10+    }
     11+#endif
     12+
     13     /* Better try to avoid seeks as much as possible. stat may be heavy but
     14      * many concurrent seeks are even worse.  */
     15     if (newfile_size == 0 && ((fstat(rrd_file->fd, &statb)) < 0)) {

  • Portfile

     
    44
    55name                    rrdtool
    66version                 1.3.4
     7revision                1
    78categories              net
    89maintainers             markd
    910description             Round Robin Database
    … …  
    2930                        port:libpng \
    3031                        port:libxml2
    3132
     33patchfiles              patch-configure.diff patch-Makefile.PL.diff \
     34                        patch-rrd_open.c.diff
     35
    3236configure.args          --enable-perl-site-install \
    3337                        --with-tcllib=${prefix}/lib \
    3438                        --disable-python \