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

wahwah at users.sourceforge.net wahwah at users.sourceforge.net
Mon Mar 19 10:28:37 CET 2012


Revision: 17454
          http://gar.svn.sourceforge.net/gar/?rev=17454&view=rev
Author:   wahwah
Date:     2012-03-19 09:28:36 +0000 (Mon, 19 Mar 2012)
Log Message:
-----------
syslog_ng/trunk: Separate deps on 5.9 and 5.10 because of glib2

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

Modified: csw/mgar/pkg/syslog_ng/trunk/Makefile
===================================================================
--- csw/mgar/pkg/syslog_ng/trunk/Makefile	2012-03-19 08:52:08 UTC (rev 17453)
+++ csw/mgar/pkg/syslog_ng/trunk/Makefile	2012-03-19 09:28:36 UTC (rev 17454)
@@ -24,6 +24,11 @@
 INITSMF = /etc/opt/csw/init\.d/cswsyslog_ng
 SAMPLECONF = /etc/opt/csw/syslog-ng\.conf\.CSW
 
+# Syslog links against glib2, which is packaged in different packages on
+# Solaris 9 and Solaris 10. Therefore, we need to build separately on 9 and
+# 10, and declare different dependencies.
+PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386
+PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
 
 # shared /opt/csw support:
 localstatedir = /var/opt/csw
@@ -50,7 +55,6 @@
 
 PACKAGES = CSWsyslog-ng
 SPKG_DESC_CSWsyslog-ng = $(DESCRIPTION)
-RUNTIME_DEP_PKGS_CSWsyslog-ng += CSWglib2
 RUNTIME_DEP_PKGS_CSWsyslog-ng += CSWlibdbi1
 RUNTIME_DEP_PKGS_CSWsyslog-ng += CSWlibevtlog0
 RUNTIME_DEP_PKGS_CSWsyslog-ng += CSWlibgcc-s1
@@ -60,6 +64,15 @@
 RUNTIME_DEP_PKGS_CSWsyslog-ng += CSWlibssl0-9-8
 RUNTIME_DEP_PKGS_CSWsyslog-ng += CSWlibwrap1
 
+# Specifying different dependencies for 5.9 and 5.10.
+RUNTIME_DEP_PKGS_CSWsyslog-ng_5.10 += CSWlibgthread2-0-0
+RUNTIME_DEP_PKGS_CSWsyslog-ng_5.10 += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWsyslog-ng_5.10 += CSWlibgmodule2-0-0
+
+RUNTIME_DEP_PKGS_CSWsyslog-ng_5.9 += CSWglib2
+
+RUNTIME_DEP_PKGS_CSWsyslog-ng += $(RUNTIME_DEP_PKGS_CSWsyslog-ng_$(GAROSREL))
+
 OBSOLETED_BY_CSWsyslog-ng = CSWsyslogng
 CATALOGNAME_CSWsyslogng = syslog_ng_stub
 

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