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

[bdwalton at users.sourceforge.net]

Revision: 9346
          http://gar.svn.sourceforge.net/gar/?rev=9346&view=rev
Author:   bdwalton
Date:     2010-03-24 03:12:46 +0000 (Wed, 24 Mar 2010)

Log Message:
-----------
ruby19: make tk/tcl links against csw x11; add deps for base pkg

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

Modified: csw/mgar/pkg/ruby19/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ruby19/trunk/Makefile	2010-03-24 00:54:36 UTC (rev 9345)
+++ csw/mgar/pkg/ruby19/trunk/Makefile	2010-03-24 03:12:46 UTC (rev 9346)
@@ -3,12 +3,6 @@
 PATCHLEVEL = p376
 CATEGORIES = lang
 
-# Overrides for checkpkg.  These are all false positives or ignorable
-# for now.
-CHECKPKG_OVERRIDES_CSWruby19tk += linked-against-discouraged-library|tcltklib.so|libX11.so.4
-CHECKPKG_OVERRIDES_CSWruby19tk += missing-dependency|CSWruby
-CHECKPKG_OVERRIDES_CSWruby19tk += surplus-dependency|CSWruby19
-
 # Working with Jens Deppe, we've determined that the two failing tests
 # in 1.9.1p376 are bad tests (as documented here[1] and here[2]).
 # They make assumptions about kernel behaviour that don't hold for
@@ -39,6 +33,8 @@
 
 ARCHALL_CSWruby19doc = 1
 
+RUNTIME_DEP_PKGS_CSWruby19 = CSWgdbm CSWiconv CSWncurses CSWosslrt
+RUNTIME_DEP_PKGS_CSWruby19 += CSWreadline CSWzlib
 RUNTIME_DEP_PKGS_CSWruby19doc = CSWruby19
 RUNTIME_DEP_PKGS_CSWruby19tk = CSWruby19 CSWtk CSWtcl
 RUNTIME_DEP_PKGS_CSWruby19dev = CSWruby19
@@ -71,6 +67,9 @@
 CONFIGURE_ARGS += --program-suffix=19
 CONFIGURE_ARGS += --enable-pthread
 
+EXTRA_INC = $(prefix)/X11/include
+EXTRA_LIB = $(prefix)/X11/lib
+
 ifdef USEGCC
 GARCOMPILER = GCC4
 RUNTIME_DEP_PKGS_CSWruby19 += CSWgcc4corert


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