[csw-devel] SF.net SVN: gar:[6129] csw/mgar/pkg/ganglia/trunk/Makefile

[d_pocock at users.sourceforge.net]

Revision: 6129
          http://gar.svn.sourceforge.net/gar/?rev=6129&view=rev
Author:   d_pocock
Date:     2009-08-28 17:27:31 +0000 (Fri, 28 Aug 2009)

Log Message:
-----------
Update for Ganglia 3.1.2, split files across multiple packages, only build library and agent packages for now

Modified Paths:
--------------
    csw/mgar/pkg/ganglia/trunk/Makefile

Modified: csw/mgar/pkg/ganglia/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ganglia/trunk/Makefile	2009-08-28 14:37:55 UTC (rev 6128)
+++ csw/mgar/pkg/ganglia/trunk/Makefile	2009-08-28 17:27:31 UTC (rev 6129)
@@ -12,16 +12,20 @@
 SF_PROJ = ganglia
 MASTER_SITES = $(SF_MIRRORS)
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
-DISTFILES += $(call admfiles,CSWpackage,)
+#DISTFILES += $(call admfiles,CSWpackage,)
 
-PACKAGES = CSWgangliart CSWgangliaagent
+PACKAGES = CSWgangliaagent CSWgangliart
 
+CATALOGNAME_CSWganglia		= ganglia
 CATALOGNAME_CSWgangliart	= ganglia_rt
 CATALOGNAME_CSWgangliaagent	= ganglia_agent
 
+SPKG_DESC_CSWganglia		= Dummy package
 SPKG_DESC_CSWgangliart		= Ganglia runtime libraries
 SPKG_DESC_CSWgangliaagent	= Ganglia performance monitoring agent gmond
 
+PREREQUISITE_PKGS = CSWexpat CSWlibconfuse CSWapache2rt
+
 REQUIRED_PKGS_CSWgangliart = CSWexpat CSWlibconfuse CSWapache2rt
 REQUIRED_PKGS_CSWgangliaagent = CSWexpat CSWlibconfuse CSWapache2rt
 REQUIRED_PKGS_CSWgangliaagent += CSWgangliart
@@ -43,6 +47,18 @@
 # Reduce dependencies, no gettext:
 CONFIGURE_ARGS += --disable-nls
 
+# For Ganglia 3.1.2, the test suite doesn't compile cleanly on Solaris,
+# so we skip it.  This should be re-assessed with each new release
+# from upstream.  Proposed fixes for the test suite to be submitted
+# upstream.
+ifeq ($(GARVERSION),3.1.2)
+#TEST_TARGET = check
+TEST_SCRIPTS = skip
+test-skip:
+        $(DONADA)
+endif
+
+PKGFILES_CSWganglia = 
 PKGFILES_CSWgangliart = $(libdir)/libganglia.*
 
 include gar/category.mk


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.