components/graphviz/patches/ruby-include.patch
author Mike Sullivan <Mike.Sullivan@Oracle.COM>
Mon, 15 Sep 2014 10:32:46 -0700
changeset 2087 e1535aa15d02
parent 2010 cb03afa45934
permissions -rw-r--r--
Close of build 57.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2010
cb03afa45934 18685168 graphviz should move to ruby 1.9
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     1
Look in the right place for ruby headers, and silence the warnings about
cb03afa45934 18685168 graphviz should move to ruby 1.9
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     2
the use of the Config module.
cb03afa45934 18685168 graphviz should move to ruby 1.9
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     3
cb03afa45934 18685168 graphviz should move to ruby 1.9
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     4
This is an in-house patch, and has not been submitted upstream, since the
cb03afa45934 18685168 graphviz should move to ruby 1.9
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     5
Config->RbConfig change has already been made in a newer version, and the
cb03afa45934 18685168 graphviz should move to ruby 1.9
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     6
remainder of the changes are Solaris-specific.
cb03afa45934 18685168 graphviz should move to ruby 1.9
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     7
cb03afa45934 18685168 graphviz should move to ruby 1.9
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     8
--- graphviz-2.28.0/config/config_ruby.rb	Fri Feb 18 13:25:56 2011
cb03afa45934 18685168 graphviz should move to ruby 1.9
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     9
+++ graphviz-2.28.0/config/config_ruby.rb	Tue Jul  1 14:45:16 2014
cb03afa45934 18685168 graphviz should move to ruby 1.9
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    10
@@ -1,16 +1,16 @@
cb03afa45934 18685168 graphviz should move to ruby 1.9
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    11
 require 'rbconfig'
cb03afa45934 18685168 graphviz should move to ruby 1.9
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    12
 
cb03afa45934 18685168 graphviz should move to ruby 1.9
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    13
-CONFIG = Config::MAKEFILE_CONFIG
cb03afa45934 18685168 graphviz should move to ruby 1.9
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    14
+CONFIG = RbConfig::MAKEFILE_CONFIG
cb03afa45934 18685168 graphviz should move to ruby 1.9
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    15
 
cb03afa45934 18685168 graphviz should move to ruby 1.9
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    16
 
cb03afa45934 18685168 graphviz should move to ruby 1.9
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    17
 case ARGV[0]
cb03afa45934 18685168 graphviz should move to ruby 1.9
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    18
 when "INCLUDES"
cb03afa45934 18685168 graphviz should move to ruby 1.9
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    19
-    puts Config::expand(CONFIG["archdir"])
cb03afa45934 18685168 graphviz should move to ruby 1.9
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    20
+    puts "#{RbConfig::expand(CONFIG['rubyhdrdir'])} -I#{RbConfig::expand(CONFIG['rubyhdrdir'])}/#{RbConfig::expand(CONFIG['arch'])}"
cb03afa45934 18685168 graphviz should move to ruby 1.9
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    21
 when "lib"
cb03afa45934 18685168 graphviz should move to ruby 1.9
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    22
-    puts Config::expand(CONFIG["libdir"])
cb03afa45934 18685168 graphviz should move to ruby 1.9
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    23
+    puts RbConfig::expand(CONFIG["libdir"])
cb03afa45934 18685168 graphviz should move to ruby 1.9
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    24
 when "archsitelib"
cb03afa45934 18685168 graphviz should move to ruby 1.9
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    25
-    puts Config::expand(CONFIG["sitearchdir"])
cb03afa45934 18685168 graphviz should move to ruby 1.9
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    26
+    puts RbConfig::expand(CONFIG["vendorarchdir"])
cb03afa45934 18685168 graphviz should move to ruby 1.9
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    27
 when "sitelib"
cb03afa45934 18685168 graphviz should move to ruby 1.9
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    28
-    puts Config::expand(CONFIG["sitedir"])
cb03afa45934 18685168 graphviz should move to ruby 1.9
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    29
+    puts RbConfig::expand(CONFIG["vendordir"])
cb03afa45934 18685168 graphviz should move to ruby 1.9
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    30
 end
cb03afa45934 18685168 graphviz should move to ruby 1.9
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    31