diff options
Diffstat (limited to 'textproc/eruby/files/patch-configure.rb')
| -rw-r--r-- | textproc/eruby/files/patch-configure.rb | 35 |
1 files changed, 30 insertions, 5 deletions
diff --git a/textproc/eruby/files/patch-configure.rb b/textproc/eruby/files/patch-configure.rb index 0f0b16f1196b..580a0893e05b 100644 --- a/textproc/eruby/files/patch-configure.rb +++ b/textproc/eruby/files/patch-configure.rb @@ -1,11 +1,36 @@ ---- configure.rb.orig 2010-02-17 16:52:48.000000000 +0100 -+++ configure.rb 2010-02-17 16:52:48.000000000 +0100 -@@ -317,7 +317,16 @@ +--- configure.rb.orig 2013-11-16 10:18:41.000000000 +0100 ++++ configure.rb 2013-11-16 10:27:26.000000000 +0100 +@@ -210,6 +210,7 @@ + + $stdout.sync = true + ++# include RbConfig ? + drive = File::PATH_SEPARATOR == ';' ? /\A\w:/ : /\A/ + prefix = Regexp.new("\\A" + Regexp.quote(CONFIG["prefix"])) + $drive = CONFIG["prefix"] =~ drive ? $& : '' +@@ -293,14 +294,14 @@ + + $arch = CONFIG["arch"] + $sitearch = CONFIG["sitearch"] +-$ruby_version = Config::CONFIG["ruby_version"] || ++$ruby_version = CONFIG["ruby_version"] || + CONFIG["MAJOR"] + "." + CONFIG["MINOR"] + + $CC = CONFIG["CC"] + $AR = CONFIG["AR"] + $LD = "$(CC)" + $RANLIB = CONFIG["RANLIB"] +-$ruby = arg_config("--ruby", File.join(Config::CONFIG["bindir"], CONFIG["ruby_install_name"])) ++$ruby = arg_config("--ruby", File.join(CONFIG["bindir"], CONFIG["ruby_install_name"])) + $RUBY = ($nmake && !$configure_args.has_key?('--ruby')) ? $ruby.gsub(%r'/', '\\') : $ruby + if RUBY_VERSION < "1.8.0" + $RM = 'rm -f' +@@ -317,7 +318,16 @@ else $CFLAGS = CFLAGS + " " + CONFIG["CCDLFLAGS"] end +if not CONFIG["rubyhdrdir"].nil? -+ $CFLAGS << " -I" + CONFIG["rubyhdrdir"] + "/" + $sitearch ++ $CFLAGS << " -I" + RbConfig::CONFIG["rubyhdrdir"] + "/" + $sitearch +end +if not ENV["EXTRA_CFLAGS"].nil? + $CFLAGS << " " + ENV["EXTRA_CFLAGS"] @@ -17,7 +42,7 @@ if $LDFLAGS.to_s.empty? && /mswin32/ =~ RUBY_PLATFORM $LDFLAGS = "-link -incremental:no -pdb:none" end -@@ -435,7 +444,7 @@ +@@ -435,7 +445,7 @@ AC_MSG_CHECKING("whether we are using gcc") if $CC == "gcc" || `#{$CC} -v 2>&1` =~ /gcc/ $using_gcc = true |