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

[bdwalton at users.sourceforge.net]

Revision: 6932
          http://gar.svn.sourceforge.net/gar/?rev=6932&view=rev
Author:   bdwalton
Date:     2009-10-21 02:06:47 +0000 (Wed, 21 Oct 2009)

Log Message:
-----------
ruby: add suncc build support, with toggle to use gcc4 easily; bdb cleanup

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

Modified: csw/mgar/pkg/ruby/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ruby/trunk/Makefile	2009-10-20 21:24:23 UTC (rev 6931)
+++ csw/mgar/pkg/ruby/trunk/Makefile	2009-10-21 02:06:47 UTC (rev 6932)
@@ -4,10 +4,10 @@
 GARVERSION = $(DISTVERSION)
 CATEGORIES = lang
 
-# disable test scripts (all passed with 1.8.7p174)
-# TEST_SCRIPTS = 
+TEST_SCRIPTS =
+TEST_ARGS = test-all
 
-PREREQUISITE_PKGS = CSWbdb3 CSWgdbm CSWgfile CSWiconv CSWncurses CSWossldevel
+PREREQUISITE_PKGS = CSWbdb CSWgdbm CSWgfile CSWiconv CSWncurses CSWossldevel
 PREREQUISITE_PKGS += CSWreadline CSWzlib
 
 PACKAGES = CSWruby CSWrubydoc CSWrubytk CSWrubydev CSWrubymode CSWrubymodeel
@@ -18,14 +18,14 @@
 
 LICENSE = COPYING
 
-REQUIRED_PKGS_CSWruby = CSWbdb CSWgdbm CSWiconv CSWgcc4corert
+REQUIRED_PKGS_CSWruby = CSWbdb CSWgdbm CSWiconv 
 REQUIRED_PKGS_CSWruby += CSWncurses CSWosslrt CSWreadline CSWzlib
 
 REQUIRED_PKGS_CSWrubydoc = CSWruby
 
 REQUIRED_PKGS_CSWrubytk = CSWruby CSWtk
 
-REQUIRED_PKGS_CSWrubydev = CSWruby CSWgcc4core CSWgfile
+REQUIRED_PKGS_CSWrubydev = CSWruby CSWgfile
 
 REQUIRED_PKGS_CSWrubymode = CSWemacscommon
 
@@ -76,12 +76,7 @@
 # See: http://rubyforge.org/tracker/index.php?func=detail&aid=17607&group_id=426&atid=1698
 PATCHFILES = rdoc_parse_order_fix.patch
 
-GARCOMPILER = GNU
 
-# This is for rbconfig.rb: without this, modules built may not get a proper
-# setting.
-EXTRA_LDFLAGS = -R $(abspath /opt/csw/gcc4/lib/$(MM_LIBDIR))
-
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-pthread
 CONFIGURE_ARGS += --enable-shared
@@ -104,6 +99,17 @@
 
 COMPILE_ELISP = 1
 
+ifdef USEGCC
+GARCOMPILER = GNU
+REQUIRED_PKGS_CSWruby += CSWgcc4corert
+REQUIRED_PKGS_CSWrubydev += CSWgcc4core
+# This is for rbconfig.rb: without this, modules built may not get a proper
+# setting.
+EXTRA_LDFLAGS = -R $(abspath /opt/csw/gcc4/lib/$(MM_LIBDIR))
+else
+SOS11_LD_FLAGS =
+endif
+
 include gar/category.mk
 
 SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(PATCHLEVEL)


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