Revision: 24930
http://sourceforge.net/p/gar/code/24930
Author: dmichelsen
Date: 2015-05-05 08:38:18 +0000 (Tue, 05 May 2015)
Log Message:
-----------
collectd/trunk: Add java.so plugin
Modified Paths:
--------------
csw/mgar/pkg/collectd/trunk/Makefile
Modified: csw/mgar/pkg/collectd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/collectd/trunk/Makefile 2015-05-05 07:00:57 UTC (rev
24929)
+++ csw/mgar/pkg/collectd/trunk/Makefile 2015-05-05 08:38:18 UTC (rev
24930)
@@ -15,12 +15,14 @@
# Lots of others missing
BUILD_DEP_PKGS += CSWlibgcrypt-dev
BUILD_DEP_PKGS += CSWnetsnmp-dev
+BUILD_DEP_PKGS += CSWjdk7
EXTRA_CPPFLAGS = -D__EXTENSIONS__
GARCOMPILER = GNU
BUILD64 = 1
+# BUILD64_ONLY = 1
ISAEXEC = 1
CONFIGURE_ARGS += $(DIRPATHS)
@@ -32,6 +34,32 @@
# Make sure net-snmp-config is found at the correct path for both 32 and 64 bit
CONFIGURE_ARGS += --with-snmp-config=$(bindir)/net-snmp-config
+# Use only Java 8 and 64 bit until this is fixed:
+# https://github.com/collectd/collectd/issues/1007
+# Also the detection uses "find" which does not follow symlinks
+
+JAVA_ARCHDIR-sparc-32 = sparc
+JAVA_ARCHDIR-sparc-64 = sparcv9
+JAVA_ARCHDIR-i386-32 = i386
+JAVA_ARCHDIR-i386-64 = amd64
+JAVA_ARCHDIR = $(JAVA_ARCHDIR-$(GARCH)-$(MEMORYMODEL))
+
+JAVA_HOME=/opt/csw/java/jdk/jdk7
+JAVA_LIBDIR = $(JAVA_HOME)/jre/lib/$(JAVA_ARCHDIR)/server
+
+JAVAC = $(JAVA_HOME)/bin/javac
+JAR = $(JAVA_HOME)/bin/jar
+JAVA_CPPFLAGS = -I$(JAVA_HOME)/include
+JAVA_LDFLAGS = -L$(JAVA_LIBDIR) -R$(JAVA_LIBDIR)
+
+CONFIGURE_ARGS += --enable-java
+CONFIGURE_ARGS += JAVAC="$(JAVAC)"
+CONFIGURE_ARGS += JAR="$(JAR)"
+CONFIGURE_ARGS += JAVA_CPPFLAGS="$(JAVA_CPPFLAGS)"
+CONFIGURE_ARGS += JAVA_LDFLAGS="$(JAVA_LDFLAGS)"
+
+CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL))
+
PACKAGES += CSWlibcollectdclient1
SPKG_DESC_CSWlibcollectdclient1 = $(DESCRIPTION), libcollectdclient.so.1
PKGFILES_CSWlibcollectdclient1 += $(call pkgfiles_lib,libcollectdclient.so.1)
@@ -73,6 +101,16 @@
# No 64 bit ganglia yet
CHECKPKG_OVERRIDES_CSWcollectd-plugin-gmond += 64-bit-binaries-missing
+PACKAGES += CSWcollectd-plugin-java
+SPKG_DESC_CSWcollectd-plugin-java = CollectD Plugin for Java
+PKGFILES_CSWcollectd-plugin-java += $(call pkgfiles_lib,collectd/java.so)
+RUNTIME_DEP_PKGS_CSWcollectd-plugin-java += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWcollectd-plugin-java += CSWjre7
+# There are some symlinks that confuse checkpkg
+CHECKPKG_OVERRIDES_CSWcollectd-plugin-java +=
soname-not-found|libjvm.so|is|needed|by|opt/csw/lib/sparcv9/collectd/java.so
+CHECKPKG_OVERRIDES_CSWcollectd-plugin-java +=
soname-not-found|libjvm.so|is|needed|by|opt/csw/lib/collectd/java.so
+CHECKPKG_OVERRIDES_CSWcollectd-plugin-java += surplus-dependency|CSWjre7
+
PACKAGES += CSWcollectd-plugin-mysql
SPKG_DESC_CSWcollectd-plugin-mysql = CollectD Plugin for MySQL
PKGFILES_CSWcollectd-plugin-mysql += $(call pkgfiles_lib,collectd/mysql.so)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
