SF.net SVN: gar:[25162] csw/mgar/pkg/glib2/trunk/Makefile

[rmottola at users.sourceforge.net]

Revision: 25162
          http://sourceforge.net/p/gar/code/25162
Author:   rmottola
Date:     2015-07-09 05:53:22 +0000 (Thu, 09 Jul 2015)
Log Message:
-----------
glib2/trunk: remove circular dependency on gamin

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

Modified: csw/mgar/pkg/glib2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/glib2/trunk/Makefile	2015-07-08 15:15:47 UTC (rev 25161)
+++ csw/mgar/pkg/glib2/trunk/Makefile	2015-07-09 05:53:22 UTC (rev 25162)
@@ -16,6 +16,7 @@
 #where can we build?
 #PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386
 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
+PACKAGING_PLATFORMS += solaris11-sparc solaris11-i386
 
 
 DESCRIPTION = The GLib library of C routines.
@@ -32,8 +33,14 @@
 DISTFILES += set-ulimit-for-build-test
 
 BUILD_DEP_PKGS = CSWggettext-dev CSWlibiconv-dev CSWlibffi-dev
-BUILD_DEP_PKGS += CSWlibdbus-dev CSWdbus CSWlibgamin-dev CSWgamin
-BUILD_DEP_PKGS += CSWpy-gobject CSWpkgconfig CSWlibpcre-dev
+BUILD_DEP_PKGS += CSWlibdbus-dev CSWdbus 
+
+#disable gamin, since gamin depends on glib2
+#BUILD_DEP_PKGS += CSWlibgamin-dev CSWgamin
+
+BUILD_DEP_PKGS += CSWpkgconfig CSWlibpcre-dev
+#disable, since py-gobject depends on glib
+#BUILD_DEP_PKGS += CSWpy-gobject 
 # To make the tests working
 BUILD_DEP_PKGS += CSWpython CSWsharedmimeinfo
 # This is used to adjust paths in documentation
@@ -48,12 +55,16 @@
 PATCHFILES += 0001-Fix-POSIX-and-XOPEN-defines.patch
 PATCHFILES += 0002-Include-sys-filio.h-to-provide-FIONREAD.patch
 PATCHFILES += 0006-Adjust-hardcoded-paths-to-match-Solaris-CSW.patch
-PATCHFILES_5.10 += 0003-Make-glib-work-with-zoneinfo-version-1.patch
-PATCHFILES_5.11 += 0020-Adjust-path-to-zoneinfo-database.patch
+#PATCHFILES_5.10 += 0003-Make-glib-work-with-zoneinfo-version-1.patch
+#PATCHFILES_5.11 += 0020-Adjust-path-to-zoneinfo-database.patch
 PATCHFILES += 0022-Change-shell-to-bash-in-test-shell-scripts.patch
 PATCHFILES += 0029-Don-t-undefine-_XOPEN_SOURCE.patch
 PATCHFILES += 0001-Fix-configure-pthread-detection.patch
 
+PATCHFILES_5.9 += 0040-clock-monotonic.patch
+PATCHFILES_5.9 += sol9-condwait.patch
+
+
 #
 # Until someone invests some real resources into checking all test patches,
 # disable tests. Updating the patches between versions is a major pita.
@@ -108,13 +119,9 @@
 #PATCHFILES += 0037-Remove-failing-tests-linking-is-broken.patch
 #PATCHFILES_5.11 += 0038-Disable-appinfo-launch-test-fails-on-s11x86.patch
 
-# PATCHFILES += $(PATCHFILES_$(GAROSREL))
+PATCHFILES += $(PATCHFILES_$(GAROSREL))
 
-# Solaris 11 specific package for FEN support
-PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
-PACKAGING_PLATFORMS += solaris11-sparc solaris11-i386
 
-
 PACKAGES += CSWglib2
 SPKG_DESC_CSWglib2 = Low level core compatibility library for GTK+ and GNOME
 # PKGFILES is catchall

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