Revision: 26695
http://sourceforge.net/p/gar/code/26695
Author: dmichelsen
Date: 2020-08-26 15:30:31 +0000 (Wed, 26 Aug 2020)
Log Message:
-----------
rrdtool/trunk: Update to 1.7.2
Modified Paths:
--------------
csw/mgar/pkg/rrdtool/trunk/Makefile
csw/mgar/pkg/rrdtool/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/rrdtool/trunk/files/0001-Include-limits.h-for-PATH_MAX.patch
Modified: csw/mgar/pkg/rrdtool/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rrdtool/trunk/Makefile 2020-08-24 07:17:08 UTC (rev 26694)
+++ csw/mgar/pkg/rrdtool/trunk/Makefile 2020-08-26 15:30:31 UTC (rev 26695)
@@ -1,5 +1,5 @@
NAME = rrdtool
-VERSION = 1.4.8
+VERSION = 1.7.2
GARTYPE = v2
DESCRIPTION = Time-series data logging and graphing
@@ -12,23 +12,24 @@
MASTER_SITES = http://oss.oetiker.ch/$(NAME)/pub/
DISTFILES = $(DISTNAME).tar.gz
-PATCHFILES += 0002-Always-link-local-libs-first-during-Perl-module.patch
+PATCHFILES += 0001-Include-limits.h-for-PATH_MAX.patch
-# Make sure to link against libperl.so to make shared libraries self-contained.
-PATCHFILES += 0003-Always-link-against-libperl.so.patch
+EXTRA_MODULATORS += PYTHON_VERSION
+#MODULATIONS_PYTHON_VERSION = 2.6 2.7
+MODULATIONS_PYTHON_VERSION = 2.7
+# We need 64 bit just once as it is without python anyway
+SKIP_MODULATIONS += isa-sparcv9-python_version-2.6
+SKIP_MODULATIONS += isa-amd64-python_version-2.6
+MERGE_SCRIPTS_isa-default-python_version-2.6 += copy-all
+MERGE_SCRIPTS_isa-default-python_version-2.7 += copy-all
+MERGE_SCRIPTS_isa-default64-python_version-2.7 += copy-relocated-only
+MERGE_DIRS_isa-default64-python_version-2.7 += $(libdir)
-# 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
+GARCOMPILER = GNU
-# 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 += CSWlibpango-dev
BUILD_DEP_PKGS += CSWlibcairo-dev
BUILD_DEP_PKGS += CSWlibglib2-dev
BUILD_DEP_PKGS += CSWperl
@@ -39,38 +40,31 @@
PACKAGES += CSWrrdtool
SPKG_DESC_CSWrrdtool = Time-series data logging and graphing
RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibglib2-0-0
-RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibintl9
RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibwrap1
-RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibrrd4
-RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibrrd-th4
+RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibrrd8
OBSOLETED_BY_CSWrrdtool = CSWrrd
CATALOGNAME_CSWrrd = rrd_stub
PACKAGES += CSWrrdtool-dev
-SPKG_DESC_CSWrrdtool-dev = Development files for librrd.so.4
+SPKG_DESC_CSWrrdtool-dev = Development files for librrd.so.8
# 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 += CSWlibrrd8
-PACKAGES += CSWlibrrd4
-SPKG_DESC_CSWlibrrd4 = Runtime library for RRDtool, librrd.so.4
-PKGFILES_CSWlibrrd4 += $(call pkgfiles_lib,librrd.so.4)
-RUNTIME_DEP_PKGS_CSWlibrrd4 += CSWlibglib2-0-0
-RUNTIME_DEP_PKGS_CSWlibrrd4 += CSWlibcairo2
-RUNTIME_DEP_PKGS_CSWlibrrd4 += CSWpango
-RUNTIME_DEP_PKGS_CSWlibrrd4 += CSWlibxml2-2
-RUNTIME_DEP_PKGS_CSWlibrrd4 += CSWlibdbi1
+PACKAGES += CSWlibrrd8
+SPKG_DESC_CSWlibrrd8 = Runtime library for RRDtool, librrd.so.8
+PKGFILES_CSWlibrrd8 += $(call pkgfiles_lib,librrd.so.8)
+RUNTIME_DEP_PKGS_CSWlibrrd8 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibrrd8 += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWlibrrd8 += CSWlibpangocairo1-0-0
+RUNTIME_DEP_PKGS_CSWlibrrd8 += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWlibrrd8 += CSWlibdbi1
+RUNTIME_DEP_PKGS_CSWlibrrd8 += CSWlibgobject2-0-0
+RUNTIME_DEP_PKGS_CSWlibrrd8 += CSWlibpng16-16
-PACKAGES += CSWlibrrd-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 += CSWlibcairo2
-RUNTIME_DEP_PKGS_CSWlibrrd-th4 += CSWlibxml2-2
-RUNTIME_DEP_PKGS_CSWlibrrd-th4 += CSWpango
-RUNTIME_DEP_PKGS_CSWlibrrd-th4 += CSWlibglib2-0-0
-RUNTIME_DEP_PKGS_CSWlibrrd-th4 += CSWlibdbi1
+# RRDTool is now threadsafe by default, so there is no more librrd-th4
PACKAGES += CSWpm-rrdtool
SPKG_DESC_CSWpm-rrdtool = RRDs: Access RRDtool as a shared module (part of
RRDtool)
@@ -80,22 +74,24 @@
PKGFILES_CSWpm-rrdtool += .*\.3perl
RUNTIME_DEP_PKGS_CSWpm-rrdtool += CSWperl
-RUNTIME_DEP_PKGS_CSWpm-rrdtool += CSWlibrrd4
-OBSOLETED_BY_CSWpm-rrdtool = CSWrrd
+RUNTIME_DEP_PKGS_CSWpm-rrdtool += CSWlibrrd8
PACKAGES += CSWpy-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
-OBSOLETED_BY_CSWpy-rrdtool = CSWrrd
+SPKG_DESC_CSWpy-rrdtool = Python egg for RRD access (part of RRDtool)
+PKGFILES_CSWpy-rrdtool = $(libdir)/python.*
+RUNTIME_DEP_PKGS_CSWpy-rrdtool += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWpy-rrdtool += CSWlibpython2-7-1-0
+RUNTIME_DEP_PKGS_CSWpy-rrdtool += CSWlibrrd8
+# Python 2.6 libs are acrually quite hard to build due to mixed Sun Studio /
GCC compiler
+# requirements, skip 2.6 for now.
+CHECKPKG_OVERRIDES_CSWpy-rrdtool += python-package-missing-py26-files
+# This is ok as the magic is in the share lib only.
+CHECKPKG_OVERRIDES_CSWpy-rrdtool += python-package-missing-py-files
PACKAGES += CSWrb-rrdtool
-SPKG_DESC_CSWpy-rrdtool = Python egg for RRD access (part of RRDtool)
+SPKG_DESC_CSWrb-rrdtool = Ruby binding for RRD access (part of RRDtool)
PKGFILES_CSWrb-rrdtool = $(libdir)/ruby/.*
-RUNTIME_DEP_PKGS_CSWrb-rrdtool += CSWlibruby18-1
-RUNTIME_DEP_PKGS_CSWrb-rrdtool += CSWlibrrd4
-OBSOLETED_BY_CSWrb-rrdtool = CSWrrd
+RUNTIME_DEP_PKGS_CSWrb-rrdtool += CSWruby20
# This is crappy and needs fixing, unfortunately inside extconf.rb which is
hard.
CHECKPKG_OVERRIDES_CSWrb-rrdtool += bad-rpath-entry
@@ -124,10 +120,20 @@
EXTRA_INC += $(includedir)/glib-2.0
EXTRA_INC += $(libdir)/glib-2.0/include
+# We need PATH_MAX from limits.h
+EXTRA_CPPFLAGS += -D__EXTENSIONS__
+
+# Avoid the error "Compiler or options invalid for pre-UNIX 03 X/Open
applications and pre-2001 POSIX applications"
+EXTRA_CPPFLAGS += -D_XPG6
+
EXTRA_LINKER_FLAGS = -lintl -z ignore
BUILD64_LIBS_ONLY = 1
+# We do not want to link against the (possibly old) version of librrd.so
+#LD_OPTIONS =
+#EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS)
+
# Verbose build output
# BUILD_ARGS += V=1
@@ -150,8 +156,15 @@
CONFIGURE_ARGS += --with-libintl-prefix=$(libdir)
CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(MEMORYMODEL))
-# TEST_TARGET = check
+EXTRA_CONFIGURE_EXPORTS += PYTHON
+CONFIGURE_ENV_PYTHON = $(bindir)/python$(PYTHON_VERSION)
+# Testsuite is failing due to mismatch in number representation like 'nan'
instead of 'NaN'
+SKIPTEST ?= 1
+
+# We need 'readlink' and 'seq'
+TEST_ENV_PATH = /opt/csw/gnu:$(PATH)
+
# 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,'
Modified: csw/mgar/pkg/rrdtool/trunk/checksums
===================================================================
--- csw/mgar/pkg/rrdtool/trunk/checksums 2020-08-24 07:17:08 UTC (rev
26694)
+++ csw/mgar/pkg/rrdtool/trunk/checksums 2020-08-26 15:30:31 UTC (rev
26695)
@@ -1 +1 @@
-dbe59386db97fd2f2216729facd74ca8 rrdtool-1.4.8.tar.gz
+638e3a0a1609d97e9f82e8832759dcd2 rrdtool-1.7.2.tar.gz
Added: csw/mgar/pkg/rrdtool/trunk/files/0001-Include-limits.h-for-PATH_MAX.patch
===================================================================
--- csw/mgar/pkg/rrdtool/trunk/files/0001-Include-limits.h-for-PATH_MAX.patch
(rev 0)
+++ csw/mgar/pkg/rrdtool/trunk/files/0001-Include-limits.h-for-PATH_MAX.patch
2020-08-26 15:30:31 UTC (rev 26695)
@@ -0,0 +1,24 @@
+From 5fa8685a53ac551df3186354cf9d4d3348a798a7 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <d...@opencsw.org>
+Date: Tue, 25 Aug 2020 14:59:57 +0200
+Subject: [PATCH] Include limits.h for PATH_MAX
+
+---
+ src/rrd_list.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/rrd_list.c b/src/rrd_list.c
+index e743b9b..c5c9479 100644
+--- a/src/rrd_list.c
++++ b/src/rrd_list.c
+@@ -15,6 +15,7 @@
+ #include <dirent.h>
+ #endif
+ #include <sys/types.h>
++#include <limits.h>
+
+ #include "rrd_tool.h"
+ #include "rrd_client.h"
+--
+2.4.0
+
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
