[csw-devel] SF.net SVN: gar:[16832] csw/mgar/pkg/rrdtool/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Thu Jan 19 22:19:22 CET 2012
Revision: 16832
http://gar.svn.sourceforge.net/gar/?rev=16832&view=rev
Author: dmichelsen
Date: 2012-01-19 21:19:21 +0000 (Thu, 19 Jan 2012)
Log Message:
-----------
rrdtool/trunk: Update to 1.4.6, use reinplace, complete rework
Modified Paths:
--------------
csw/mgar/pkg/rrdtool/trunk/Makefile
csw/mgar/pkg/rrdtool/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/rrdtool/trunk/files/0001-Do-not-reference-tm.tm_gmtoff-on-Solaris.patch
csw/mgar/pkg/rrdtool/trunk/files/0002-Always-link-local-libs-first-during-Perl-module.patch
csw/mgar/pkg/rrdtool/trunk/files/0003-Always-link-against-libperl.so.patch
csw/mgar/pkg/rrdtool/trunk/files/0004-Do-not-pass-LDFLAGS-to-pysetup-or-the-system-lib-is-.patch
Removed Paths:
-------------
csw/mgar/pkg/rrdtool/trunk/files/patch-bindings-perl-piped-Makefile.PL
csw/mgar/pkg/rrdtool/trunk/files/patch-bindings-perl-shared-Makefile.PL
csw/mgar/pkg/rrdtool/trunk/files/patch-bindings-ruby-extconf.rb
csw/mgar/pkg/rrdtool/trunk/gar
Modified: csw/mgar/pkg/rrdtool/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rrdtool/trunk/Makefile 2012-01-19 21:07:24 UTC (rev 16831)
+++ csw/mgar/pkg/rrdtool/trunk/Makefile 2012-01-19 21:19:21 UTC (rev 16832)
@@ -1,5 +1,5 @@
NAME = rrdtool
-VERSION = 1.4.5
+VERSION = 1.4.6
CATEGORIES = utils
DESCRIPTION = Time-series data logging and graphing
@@ -10,155 +10,180 @@
endef
MASTER_SITES = http://oss.oetiker.ch/$(NAME)/pub/
-DISTFILES = $(NAME)-$(VERSION).tar.gz
+DISTFILES = $(DISTNAME).tar.gz
+# Use patch until this is fixed:
+# http://oss.oetiker.ch/rrdtool-trac/ticket/330
+PATCHFILES += 0001-Do-not-reference-tm.tm_gmtoff-on-Solaris.patch
+
+PATCHFILES += 0002-Always-link-local-libs-first-during-Perl-module.patch
+
# Make sure to link against libperl.so to make shared libraries self-contained.
-PATCHFILES += patch-bindings-perl-piped-Makefile.PL
-PATCHFILES += patch-bindings-perl-shared-Makefile.PL
+PATCHFILES += 0003-Always-link-against-libperl.so.patch
-# This is the stub
-CATALOGNAME_CSWrrd = rrd_stub
+# Do not pass LDFLAGS during pysetup or -L/opt/csw/lib will appear too early during
+# linking which results in the system installed librrd.so is linked against instead
+# of the newly build one
+PATCHFILES += 0004-Do-not-pass-LDFLAGS-to-pysetup-or-the-system-lib-is-.patch
+# New glib2 is only available for Solaris 10
+PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
+
+VENDOR_URL = http://oss.oetiker.ch/rrdtool/
+
+BUILD_DEP_PKGS += $(RUNTIME_DEP_PKGS_CSWlibrrd4)
+BUILD_DEP_PKGS += CSWpangodevel
+BUILD_DEP_PKGS += CSWlibcairo-dev
+BUILD_DEP_PKGS += CSWlibglib2-dev
+BUILD_DEP_PKGS += CSWperl
+BUILD_DEP_PKGS += CSWpython-dev
+BUILD_DEP_PKGS += CSWruby18-dev
+BUILD_DEP_PKGS += CSWlibdbi-devel
+
PACKAGES += CSWrrdtool
-CATALOGNAME_CSWrrdtool = rrdtool
SPKG_DESC_CSWrrdtool = Time-series data logging and graphing
-RUNTIME_DEP_PKGS_CSWrrdtool += CSWglib2
+RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibglib2-0-0
RUNTIME_DEP_PKGS_CSWrrdtool += CSWpango
-RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibxml2
-RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibcairo
+RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibcairo2
RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWrrdtool += CSWtcpwrap
+RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibwrap1
RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibdbi1
-RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibrrd4
-RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibrrd-th4
+RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibrrd3
+RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibrrd-th3
OBSOLETED_BY_CSWrrdtool = CSWrrd
+CATALOGNAME_CSWrrd = rrd_stub
PACKAGES += CSWrrdtool-dev
-CATALOGNAME_CSWrrdtool-dev = rrdtool_dev
-SPKG_DESC_CSWrrdtool-dev = Development files for librrd.so.4
+SPKG_DESC_CSWrrdtool-dev = Development files for librrd.so.3
+# Explicitly do not include *.3perl
+PKGFILES_DEVEL_MAN3_MANPAGE = $(mandir)/man3/.*\.3
PKGFILES_CSWrrdtool-dev = $(PKGFILES_DEVEL)
-RUNTIME_DEP_PKGS_CSWrrdtool-dev += CSWlibrrd4
-RUNTIME_DEP_PKGS_CSWrrdtool-dev += CSWlibrrd-th4
+RUNTIME_DEP_PKGS_CSWrrdtool-dev += CSWlibrrd3
+RUNTIME_DEP_PKGS_CSWrrdtool-dev += CSWlibrrd-th3
-PACKAGES += CSWlibrrd4
-CATALOGNAME_CSWlibrrd4 = librrd4
-SPKG_DESC_CSWlibrrd4 = Runtime library for RRDtool, librrd.so.4
-PKGFILES_CSWlibrrd4 += $(call pkgfiles_lib,librrd.so.4)
-RUNTIME_DEP_PKGS_CSWlibrrd4 += CSWglib2
-RUNTIME_DEP_PKGS_CSWlibrrd4 += CSWlibcairo
-RUNTIME_DEP_PKGS_CSWlibrrd4 += CSWpango
-RUNTIME_DEP_PKGS_CSWlibrrd4 += CSWlibxml2
-RUNTIME_DEP_PKGS_CSWlibrrd4 += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWlibrrd4 += CSWtcpwrap
-RUNTIME_DEP_PKGS_CSWlibrrd4 += CSWlibdbi1
+PACKAGES += CSWlibrrd3
+SPKG_DESC_CSWlibrrd3 = Runtime library for RRDtool, librrd.so.3
+PKGFILES_CSWlibrrd3 += $(call pkgfiles_lib,librrd.so.3)
+RUNTIME_DEP_PKGS_CSWlibrrd3 += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWlibrrd3 += CSWlibcairo2
+RUNTIME_DEP_PKGS_CSWlibrrd3 += CSWpango
+RUNTIME_DEP_PKGS_CSWlibrrd3 += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWlibrrd3 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibrrd3 += CSWlibwrap1
+RUNTIME_DEP_PKGS_CSWlibrrd3 += CSWlibdbi1
-PACKAGES += CSWlibrrd-th4
-CATALOGNAME_CSWlibrrd-th4 = librrd_th4
-SPKG_DESC_CSWlibrrd-th4 = Runtime library for RRDtool, librrd_th.so.4
-PKGFILES_CSWlibrrd-th4 += $(call pkgfiles_lib,librrd_th.so.4)
-RUNTIME_DEP_PKGS_CSWlibrrd-th4 += CSWtcpwrap
-RUNTIME_DEP_PKGS_CSWlibrrd-th4 += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWlibrrd-th4 += CSWlibcairo
-RUNTIME_DEP_PKGS_CSWlibrrd-th4 += CSWlibxml2
-RUNTIME_DEP_PKGS_CSWlibrrd-th4 += CSWpango
-RUNTIME_DEP_PKGS_CSWlibrrd-th4 += CSWglib2
-RUNTIME_DEP_PKGS_CSWlibrrd-th4 += CSWlibdbi1
+PACKAGES += CSWlibrrd-th3
+SPKG_DESC_CSWlibrrd-th3 = Runtime library for RRDtool, librrd_th.so.3
+PKGFILES_CSWlibrrd-th3 += $(call pkgfiles_lib,librrd_th.so.3)
+RUNTIME_DEP_PKGS_CSWlibrrd-th3 += CSWlibwrap1
+RUNTIME_DEP_PKGS_CSWlibrrd-th3 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibrrd-th3 += CSWlibcairo2
+RUNTIME_DEP_PKGS_CSWlibrrd-th3 += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWlibrrd-th3 += CSWpango
+RUNTIME_DEP_PKGS_CSWlibrrd-th3 += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWlibrrd-th3 += CSWlibdbi1
PACKAGES += CSWpm-rrdtool
-CATALOGNAME_CSWpm-rrdtool = pm_rrdtool
SPKG_DESC_CSWpm-rrdtool = RRDs: Access RRDtool as a shared module (part of RRDtool)
PKGFILES_CSWpm-rrdtool += $(libdir)/perl/.*
PKGFILES_CSWpm-rrdtool += $(sharedstatedir)/perl/.*
PKGFILES_CSWpm-rrdtool += $(sharedstatedir)/rrdtool/examples/.*
PKGFILES_CSWpm-rrdtool += .*\.3perl
+
RUNTIME_DEP_PKGS_CSWpm-rrdtool += CSWperl
-RUNTIME_DEP_PKGS_CSWpm-rrdtool += CSWlibrrd4
+RUNTIME_DEP_PKGS_CSWpm-rrdtool += CSWlibrrd3
OBSOLETED_BY_CSWpm-rrdtool = CSWrrd
PACKAGES += CSWpy-rrdtool
-CATALOGNAME_CSWpy-rrdtool = py_rrdtool
SPKG_DESC_CSWrb-rrdtool = Ruby binding for RRD access (part of RRDtool)
PKGFILES_CSWpy-rrdtool = $(libdir)/python/.*
RUNTIME_DEP_PKGS_CSWpy-rrdtool += CSWlibpython2-6-1-0
-RUNTIME_DEP_PKGS_CSWpy-rrdtool += CSWlibrrd4
-RUNTIME_DEP_PKGS_CSWpy-rrdtool += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWpy-rrdtool += CSWlibrrd3
OBSOLETED_BY_CSWpy-rrdtool = CSWrrd
PACKAGES += CSWrb-rrdtool
-CATALOGNAME_CSWrb-rrdtool = rb_rrdtool
SPKG_DESC_CSWpy-rrdtool = Python egg for RRD access (part of RRDtool)
PKGFILES_CSWrb-rrdtool = $(libdir)/ruby/.*
-RUNTIME_DEP_PKGS_CSWrb-rrdtool += CSWlibruby1
-RUNTIME_DEP_PKGS_CSWrb-rrdtool += CSWlibrrd4
+RUNTIME_DEP_PKGS_CSWrb-rrdtool += CSWlibruby18-1
+RUNTIME_DEP_PKGS_CSWrb-rrdtool += CSWlibrrd3
OBSOLETED_BY_CSWrb-rrdtool = CSWrrd
# This is crappy and needs fixing, unfortunately inside extconf.rb which is hard.
CHECKPKG_OVERRIDES_CSWrb-rrdtool += bad-rpath-entry
-BUILD_DEP_PKGS += $(RUNTIME_DEP_PKGS_CSWlibrrd4)
-BUILD_DEP_PKGS += CSWpangodevel
-BUILD_DEP_PKGS += CSWlibcairodevel
-BUILD_DEP_PKGS += CSWglib2devel
-BUILD_DEP_PKGS += CSWperl
-BUILD_DEP_PKGS += CSWpython-devel
-BUILD_DEP_PKGS += CSWrubydev
+#CHECKPKG_OVERRIDES_CSWpm-rrdtool += file-with-bad-content|/usr/local|root/opt/csw/share/man/man3/RRDp.3perl
+#CHECKPKG_OVERRIDES_CSWpm-rrdtool += file-with-bad-content|/usr/local|root/opt/csw/share/perl/csw/RRDp.pm
+#CHECKPKG_OVERRIDES_CSWpm-rrdtool += pkginfo-opencsw-repository-uncommitted
+#CHECKPKG_OVERRIDES_CSWrrdtool += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/rrd-beginners.1
+#CHECKPKG_OVERRIDES_CSWrrdtool += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/rrdcgi.1
+#CHECKPKG_OVERRIDES_CSWrrdtool += file-with-bad-content|/usr/local|root/opt/csw/share/doc/rrdtool/html/rrdcgi.html
+#CHECKPKG_OVERRIDES_CSWrrdtool += file-with-bad-content|/usr/local|root/opt/csw/share/doc/rrdtool/html/rrd-beginners.html
+#CHECKPKG_OVERRIDES_CSWrrdtool += file-with-bad-content|/usr/local|root/opt/csw/share/doc/rrdtool/html/RRDp.html
+#CHECKPKG_OVERRIDES_CSWrrdtool += file-with-bad-content|/usr/local|root/opt/csw/share/doc/rrdtool/txt/rrdcgi.txt
+#CHECKPKG_OVERRIDES_CSWrrdtool += file-with-bad-content|/usr/local|root/opt/csw/share/doc/rrdtool/txt/rrd-beginners.pod
+#CHECKPKG_OVERRIDES_CSWrrdtool += file-with-bad-content|/usr/local|root/opt/csw/share/doc/rrdtool/txt/rrd-beginners.txt
+#CHECKPKG_OVERRIDES_CSWrrdtool += file-with-bad-content|/usr/local|root/opt/csw/share/doc/rrdtool/txt/rrdcgi.pod
+#CHECKPKG_OVERRIDES_CSWrrdtool += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/rrdbuild.1
+#CHECKPKG_OVERRIDES_CSWrrdtool += file-with-bad-content|/usr/share|root/opt/csw/share/doc/rrdtool/html/rrdbuild.html
+#CHECKPKG_OVERRIDES_CSWrrdtool += file-with-bad-content|/usr/share|root/opt/csw/share/doc/rrdtool/txt/rrdbuild.pod
+#CHECKPKG_OVERRIDES_CSWrrdtool += file-with-bad-content|/usr/share|root/opt/csw/share/doc/rrdtool/txt/rrdbuild.txt
-EXTRA_INC = $(prefix)/include/cairo
-EXTRA_INC += $(prefix)/include/libxml2
+REINPLACE_USRLOCAL += /opt/csw/share/perl/csw/RRDp.pm
+REINPLACE_USRLOCAL += /opt/csw/share/man/man3/RRDp.3perl
+REINPLACE_USRLOCAL += /opt/csw/share/man/man1/rrd-beginners.1
+REINPLACE_USRLOCAL += /opt/csw/share/man/man1/rrdcgi.1
+REINPLACE_USRLOCAL += /opt/csw/share/doc/rrdtool-$(VERSION)/txt/rrd-beginners.pod
+REINPLACE_USRLOCAL += /opt/csw/share/doc/rrdtool-$(VERSION)/txt/rrdcgi.pod
+REINPLACE_USRLOCAL += /opt/csw/share/doc/rrdtool-$(VERSION)/txt/rrd-beginners.txt
+REINPLACE_USRLOCAL += /opt/csw/share/doc/rrdtool-$(VERSION)/txt/rrdcgi.txt
+REINPLACE_USRLOCAL += /opt/csw/share/doc/rrdtool-$(VERSION)/html/rrd-beginners.html
+REINPLACE_USRLOCAL += /opt/csw/share/doc/rrdtool-$(VERSION)/html/RRDp.html
+REINPLACE_USRLOCAL += /opt/csw/share/doc/rrdtool-$(VERSION)/html/rrdcgi.html
+REINPLACE_WHEN_USRLOCAL = postinstall
+REINPLACE_USRSHARE += /opt/csw/share/man/man1/rrdbuild.1
+REINPLACE_USRSHARE += /opt/csw/share/doc/rrdtool-$(VERSION)/txt/rrdbuild.txt
+REINPLACE_USRSHARE += /opt/csw/share/doc/rrdtool-$(VERSION)/txt/rrdbuild.pod
+REINPLACE_USRSHARE += /opt/csw/share/doc/rrdtool-$(VERSION)/html/rrdbuild.html
+REINPLACE_WHEN_USRSHARE = postinstall
+
+EXTRA_INC += $(includedir)/pango-1.0
+EXTRA_INC += $(includedir)/cairo
+EXTRA_INC += $(includedir)/libxml2
+EXTRA_INC += $(includedir)/glib-2.0
+EXTRA_INC += $(libdir)/glib-2.0/include
+
EXTRA_LINKER_FLAGS = -lintl
BUILD64 = 1
-NOISAEXEC = 1
-STRIP_LIBTOOL = 1
+# Verbose build output
+# BUILD_ARGS += V=1
+
CONFIGURE_ARGS_32 += --enable-python
CONFIGURE_ARGS_32 += --enable-ruby
CONFIGURE_ARGS_32 += --with-ruby-options=RUBY_MAKE_OPTIONS=DESTDIR=$(DESTDIR)
CONFIGURE_ARGS_32 += --enable-perl
+# Reenable when new lua package with pkgconfig is there
+CONFIGURE_ARGS_32 += --disable-lua
CONFIGURE_ARGS_32 += --with-perl-options=INSTALLDIRS=vendor
# We don't have any of these in 64 bit (yet!)
CONFIGURE_ARGS_64 += --disable-python
CONFIGURE_ARGS_64 += --disable-ruby
CONFIGURE_ARGS_64 += --disable-perl
+CONFIGURE_ARGS_64 += --disable-lua
CONFIGURE_ARGS = $(DIRPATHS)
CONFIGURE_ARGS += --docdir=$(sharedstatedir)/doc/$(NAME)
-CONFIGURE_ARGS += --disable-lua
CONFIGURE_ARGS += --disable-tcl
CONFIGURE_ARGS += --with-libintl-prefix=$(libdir)
CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(MEMORYMODEL))
-TEST_TARGET = check
+# TEST_TARGET = check
MERGE_DIRS_isa-extra = $(libdir)
-MERGE_SCRIPTS_isa-extra = copy-relocated-only copy-config-only
+# MERGE_SCRIPTS_isa-extra = copy-relocated-only copy-config-only
EXTRA_MERGE_EXCLUDE_FILES = .*~ .*perllocal\.pod .*/\.packlist
EXTRA_PAX_ARGS += -s ',^\.$(docdir)/$(NAME)-$(VERSION),.$(BUILD_PREFIX)/share/doc/rrdtool,'
include gar/category.mk
-
-post-install-modulated:
- perl -pi -e 's,/usr/local,$(prefix),g' \
- $(addprefix $(DESTDIR), \
- /opt/csw/share/perl/csw/RRDp.pm \
- /opt/csw/share/man/man3/RRDp.3perl \
- /opt/csw/share/man/man1/rrd-beginners.1 \
- /opt/csw/share/man/man1/rrdcgi.1 \
- /opt/csw/share/doc/rrdtool-1.4.5/txt/rrd-beginners.pod \
- /opt/csw/share/doc/rrdtool-1.4.5/txt/rrdcgi.pod \
- /opt/csw/share/doc/rrdtool-1.4.5/txt/rrd-beginners.txt \
- /opt/csw/share/doc/rrdtool-1.4.5/txt/rrdcgi.txt \
- /opt/csw/share/doc/rrdtool-1.4.5/html/rrd-beginners.html \
- /opt/csw/share/doc/rrdtool-1.4.5/html/RRDp.html \
- /opt/csw/share/doc/rrdtool-1.4.5/html/rrdcgi.html \
- )
-
- perl -pi -e 's,/usr/share,$(sharedstatedir),g' \
- $(addprefix $(DESTDIR), \
- /opt/csw/share/man/man1/rrdbuild.1 \
- /opt/csw/share/doc/rrdtool-1.4.5/txt/rrdbuild.txt \
- /opt/csw/share/doc/rrdtool-1.4.5/txt/rrdbuild.pod \
- /opt/csw/share/doc/rrdtool-1.4.5/html/rrdbuild.html \
- )
-
- @$(MAKECOOKIE)
Modified: csw/mgar/pkg/rrdtool/trunk/checksums
===================================================================
--- csw/mgar/pkg/rrdtool/trunk/checksums 2012-01-19 21:07:24 UTC (rev 16831)
+++ csw/mgar/pkg/rrdtool/trunk/checksums 2012-01-19 21:19:21 UTC (rev 16832)
@@ -1 +1 @@
-4d116dba9a0888d8aaac179e35d3980a rrdtool-1.4.5.tar.gz
+f62316beba89b5f31880850d2c2a5267 rrdtool-1.4.6.tar.gz
Added: csw/mgar/pkg/rrdtool/trunk/files/0001-Do-not-reference-tm.tm_gmtoff-on-Solaris.patch
===================================================================
--- csw/mgar/pkg/rrdtool/trunk/files/0001-Do-not-reference-tm.tm_gmtoff-on-Solaris.patch (rev 0)
+++ csw/mgar/pkg/rrdtool/trunk/files/0001-Do-not-reference-tm.tm_gmtoff-on-Solaris.patch 2012-01-19 21:19:21 UTC (rev 16832)
@@ -0,0 +1,26 @@
+From 62585d67b81bd3b47872a061f8c369504bce986f Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Thu, 19 Jan 2012 15:51:37 +0100
+Subject: [PATCH] Do not reference tm.tm_gmtoff on Solaris
+
+---
+ src/rrd_fetch_libdbi.c | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/src/rrd_fetch_libdbi.c b/src/rrd_fetch_libdbi.c
+index 21fbc08..9d437aa 100644
+--- a/src/rrd_fetch_libdbi.c
++++ b/src/rrd_fetch_libdbi.c
+@@ -464,7 +464,9 @@ rrd_fetch_fn_libdbi(
+ struct tm tm;
+ time_t t=time(NULL);
+ localtime_r(&t,&tm);
++#if !defined(__sun) && !defined(__sun__)
+ gmt_offset=tm.tm_gmtoff;
++#endif
+ isunixtime=0; table_help.timestamp++;
+ }
+ /* hex-unescape the value */
+--
+1.7.8.3
+
Added: csw/mgar/pkg/rrdtool/trunk/files/0002-Always-link-local-libs-first-during-Perl-module.patch
===================================================================
--- csw/mgar/pkg/rrdtool/trunk/files/0002-Always-link-local-libs-first-during-Perl-module.patch (rev 0)
+++ csw/mgar/pkg/rrdtool/trunk/files/0002-Always-link-local-libs-first-during-Perl-module.patch 2012-01-19 21:19:21 UTC (rev 16832)
@@ -0,0 +1,25 @@
+From 29ea3c2cccc14da8b3cbcd02a0965563dfbe680a Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Thu, 19 Jan 2012 16:39:18 +0100
+Subject: [PATCH] Always link local libs first during Perl module
+
+---
+ bindings/perl-shared/Makefile.PL | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/bindings/perl-shared/Makefile.PL b/bindings/perl-shared/Makefile.PL
+index 781682c..85e2629 100644
+--- a/bindings/perl-shared/Makefile.PL
++++ b/bindings/perl-shared/Makefile.PL
+@@ -57,7 +57,7 @@ if (($Config{'osname'} eq 'MSWin32' && $ENV{'OSTYPE'} eq '')) {
+ 'depend' => {'RRDs.c' => "../../src/librrd.la"},
+ 'LDFROM' => '$(OBJECT) '.$librrd,
+ 'realclean' => {FILES => 't/demo?.rrd t/demo?.png' },
+- ($^O eq 'darwin') ? ( 'LDDLFLAGS' => "-L../../src/.libs/ $Config{lddlflags}" ) : ()
++ 'LDDLFLAGS' => "-L../../src/.libs/ $Config{lddlflags}"
+ );
+ }
+
+--
+1.7.8.3
+
Added: csw/mgar/pkg/rrdtool/trunk/files/0003-Always-link-against-libperl.so.patch
===================================================================
--- csw/mgar/pkg/rrdtool/trunk/files/0003-Always-link-against-libperl.so.patch (rev 0)
+++ csw/mgar/pkg/rrdtool/trunk/files/0003-Always-link-against-libperl.so.patch 2012-01-19 21:19:21 UTC (rev 16832)
@@ -0,0 +1,37 @@
+From d9cd315cb85caf2e4c5237d4a055367b776feda0 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Thu, 19 Jan 2012 16:42:41 +0100
+Subject: [PATCH] Always link against libperl.so
+
+---
+ bindings/perl-piped/Makefile.PL | 1 +
+ bindings/perl-shared/Makefile.PL | 1 +
+ 2 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/bindings/perl-piped/Makefile.PL b/bindings/perl-piped/Makefile.PL
+index 5c1a98f..2aa47db 100644
+--- a/bindings/perl-piped/Makefile.PL
++++ b/bindings/perl-piped/Makefile.PL
+@@ -5,6 +5,7 @@ use ExtUtils::MakeMaker;
+ WriteMakefile(
+ 'NAME' => 'RRDp',
+ 'VERSION' => '0.99.0', # finds $VERSION
++ 'LIBS' => '-lperl',
+ 'linkext' => {LINKTYPE => ''},
+ 'dist' => {COMPRESS=>'gzip', SUFFIX=>'gz'},
+ );
+diff --git a/bindings/perl-shared/Makefile.PL b/bindings/perl-shared/Makefile.PL
+index 85e2629..094b48f 100644
+--- a/bindings/perl-shared/Makefile.PL
++++ b/bindings/perl-shared/Makefile.PL
+@@ -52,6 +52,7 @@ if (($Config{'osname'} eq 'MSWin32' && $ENV{'OSTYPE'} eq '')) {
+ 'VERSION_FROM' => 'RRDs.pm', # finds $VERSION
+ 'DEFINE' => "-DPERLPATCHLEVEL=$Config{PATCHLEVEL}",
+ 'INC' => '-I../../src',
++ 'LIBS' => '-lperl',
+ # Perl will figure out which one is valid
+ #'dynamic_lib' => {'OTHERLDFLAGS' => "$librrd -lm"},
+ 'depend' => {'RRDs.c' => "../../src/librrd.la"},
+--
+1.7.8.3
+
Added: csw/mgar/pkg/rrdtool/trunk/files/0004-Do-not-pass-LDFLAGS-to-pysetup-or-the-system-lib-is-.patch
===================================================================
--- csw/mgar/pkg/rrdtool/trunk/files/0004-Do-not-pass-LDFLAGS-to-pysetup-or-the-system-lib-is-.patch (rev 0)
+++ csw/mgar/pkg/rrdtool/trunk/files/0004-Do-not-pass-LDFLAGS-to-pysetup-or-the-system-lib-is-.patch 2012-01-19 21:19:21 UTC (rev 16832)
@@ -0,0 +1,26 @@
+From 0e9bcfe4f39134290074fb44b664590ee855f17b Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Thu, 19 Jan 2012 21:40:56 +0100
+Subject: [PATCH] Do not pass LDFLAGS to pysetup or the system lib is pulled
+ in before the newly build one
+
+---
+ bindings/Makefile.in | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/bindings/Makefile.in b/bindings/Makefile.in
+index 1c8548e..5200f60 100644
+--- a/bindings/Makefile.in
++++ b/bindings/Makefile.in
+@@ -670,7 +670,7 @@ ruby: Makefile
+
+ # rules for building the pyton module
+ python: Makefile
+- cd python && env BUILDLIBDIR=../../src/.libs $(PYTHON) setup.py build_ext --rpath=$(libdir) && env LIBDIR=../../src/.libs $(PYTHON) setup.py build
++ cd python && env BUILDLIBDIR=../../src/.libs LDFLAGS= $(PYTHON) setup.py build_ext --rpath=$(libdir) && env LIBDIR=../../src/.libs $(PYTHON) setup.py build
+
+ # rules for building the perl module
+ perl_piped: perl-piped/Makefile
+--
+1.7.8.3
+
Deleted: csw/mgar/pkg/rrdtool/trunk/files/patch-bindings-perl-piped-Makefile.PL
===================================================================
--- csw/mgar/pkg/rrdtool/trunk/files/patch-bindings-perl-piped-Makefile.PL 2012-01-19 21:07:24 UTC (rev 16831)
+++ csw/mgar/pkg/rrdtool/trunk/files/patch-bindings-perl-piped-Makefile.PL 2012-01-19 21:19:21 UTC (rev 16832)
@@ -1,10 +0,0 @@
---- rrdtool-1.4.2.orig/bindings/perl-piped/Makefile.PL 2008-03-15 11:39:48.000000000 +0100
-+++ rrdtool-1.4.2/bindings/perl-piped/Makefile.PL 2010-03-04 16:15:51.013159708 +0100
-@@ -5,6 +5,7 @@
- WriteMakefile(
- 'NAME' => 'RRDp',
- 'VERSION' => '0.99.0', # finds $VERSION
-+ 'LIBS' => '-lperl',
- 'linkext' => {LINKTYPE => ''},
- 'dist' => {COMPRESS=>'gzip', SUFFIX=>'gz'},
- );
Deleted: csw/mgar/pkg/rrdtool/trunk/files/patch-bindings-perl-shared-Makefile.PL
===================================================================
--- csw/mgar/pkg/rrdtool/trunk/files/patch-bindings-perl-shared-Makefile.PL 2012-01-19 21:07:24 UTC (rev 16831)
+++ csw/mgar/pkg/rrdtool/trunk/files/patch-bindings-perl-shared-Makefile.PL 2012-01-19 21:19:21 UTC (rev 16832)
@@ -1,10 +0,0 @@
---- rrdtool-1.4.2.orig/bindings/perl-shared/Makefile.PL 2008-12-05 16:39:55.000000000 +0100
-+++ rrdtool-1.4.2/bindings/perl-shared/Makefile.PL 2010-03-04 16:15:30.877275566 +0100
-@@ -37,6 +37,7 @@
- 'VERSION_FROM' => 'RRDs.pm', # finds $VERSION
- 'DEFINE' => "-DPERLPATCHLEVEL=$Config{PATCHLEVEL}",
- 'INC' => '-I../../src',
-+ 'LIBS' => '-lperl',
- # Perl will figure out which one is valid
- #'dynamic_lib' => {'OTHERLDFLAGS' => "$librrd -lm"},
- 'depend' => {'RRDs.c' => "../../src/librrd.la"},
Deleted: csw/mgar/pkg/rrdtool/trunk/files/patch-bindings-ruby-extconf.rb
===================================================================
--- csw/mgar/pkg/rrdtool/trunk/files/patch-bindings-ruby-extconf.rb 2012-01-19 21:07:24 UTC (rev 16831)
+++ csw/mgar/pkg/rrdtool/trunk/files/patch-bindings-ruby-extconf.rb 2012-01-19 21:19:21 UTC (rev 16832)
@@ -1,11 +0,0 @@
---- rrdtool-1.4.2.orig/bindings/ruby/extconf.rb 2010-03-02 16:12:18.622716000 +0100
-+++ rrdtool-1.4.2/bindings/ruby/extconf.rb 2010-03-02 17:27:47.399923107 +0100
-@@ -6,7 +6,7 @@
- if /linux/ =~ RUBY_PLATFORM
- $LDFLAGS += '-Wl,--rpath -Wl,$(EPREFIX)/lib'
- elsif /solaris/ =~ RUBY_PLATFORM
-- $LDFLAGS += '-R$(EPREFIX)/lib'
-+ $LDFLAGS += ' -R$(EPREFIX)/lib'
- elsif /hpux/ =~ RUBY_PLATFORM
- $LDFLAGS += '+b$(EPREFIX)/lib'
- elsif /aix/ =~ RUBY_PLATFORM
Deleted: csw/mgar/pkg/rrdtool/trunk/gar
===================================================================
--- csw/mgar/pkg/rrdtool/trunk/gar 2012-01-19 21:07:24 UTC (rev 16831)
+++ csw/mgar/pkg/rrdtool/trunk/gar 2012-01-19 21:19:21 UTC (rev 16832)
@@ -1 +0,0 @@
-link ../../../gar/v2
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list