author | April Chin <april.chin@oracle.com> |
Wed, 25 Feb 2015 16:04:16 -0800 | |
branch | s11-update |
changeset 3857 | 5e5034b03491 |
permissions | -rw-r--r-- |
3857
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
1 |
Fixes from vim v7.4 configure for Ruby 1.9 and later versions-- |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
2 |
uses RbConfig instead of Config (deprecated in Ruby 1.9) and changes |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
3 |
vim to use libruby.so.# from /usr/lib/$(MACH64) rather than libruby.so. |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
4 |
|
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
5 |
Patching configure instead of configure.in; attempts to |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
6 |
run autoreconf against the patched configure.in produced errors. |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
7 |
Remove this patch once the vim upgrade to version 7.4 or later |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
8 |
is backported. |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
9 |
|
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
10 |
--- src/auto/configure Tue Jul 10 13:28:45 2012 |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
11 |
+++ src/auto/configure Mon Feb 23 17:51:02 2015 |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
12 |
@@ -6327,42 +6327,55 @@ |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
13 |
if $vi_cv_path_ruby -e '(VERSION rescue RUBY_VERSION) >= "1.6.0" or exit 1' >/dev/null 2>/dev/null; then |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
14 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5 |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
15 |
$as_echo "OK" >&6; } |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
16 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking Ruby rbconfig" >&5 |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
17 |
+$as_echo_n "checking Ruby rbconfig... " >&6; } |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
18 |
+ ruby_rbconfig="RbConfig" |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
19 |
+ if ! $vi_cv_path_ruby -r rbconfig -e 'RbConfig' >/dev/null 2>/dev/null; then |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
20 |
+ ruby_rbconfig="Config" |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
21 |
+ fi |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
22 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ruby_rbconfig" >&5 |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
23 |
+$as_echo "$ruby_rbconfig" >&6; } |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
24 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Ruby header files" >&5 |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
25 |
$as_echo_n "checking Ruby header files... " >&6; } |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
26 |
- rubyhdrdir=`$vi_cv_path_ruby -r mkmf -e 'print Config::CONFIG["rubyhdrdir"] || Config::CONFIG["archdir"] || $hdrdir' 2>/dev/null` |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
27 |
+ rubyhdrdir=`$vi_cv_path_ruby -r mkmf -e "print $ruby_rbconfig::CONFIG['rubyhdrdir'] || $ruby_rbconfig::CONFIG['archdir'] || \\$hdrdir" 2>/dev/null` |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
28 |
if test "X$rubyhdrdir" != "X"; then |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
29 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $rubyhdrdir" >&5 |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
30 |
$as_echo "$rubyhdrdir" >&6; } |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
31 |
RUBY_CFLAGS="-I$rubyhdrdir" |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
32 |
- rubyarch=`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG["arch"]'` |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
33 |
+ rubyarch=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig::CONFIG['arch']"` |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
34 |
if test -d "$rubyhdrdir/$rubyarch"; then |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
35 |
RUBY_CFLAGS="$RUBY_CFLAGS -I$rubyhdrdir/$rubyarch" |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
36 |
fi |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
37 |
- rubyversion=`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG["ruby_version"].gsub(/\./, "")[0,2]'` |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
38 |
+ rubyversion=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig::CONFIG['ruby_version'].gsub(/\./, '')[0,2]"` |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
39 |
+ if test "X$rubyversion" = "X"; then |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
40 |
+ rubyversion=`$vi_cv_path_ruby -e "print ((VERSION rescue RUBY_VERSION)).gsub(/\./, '')[0,2]"` |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
41 |
+ fi |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
42 |
RUBY_CFLAGS="$RUBY_CFLAGS -DRUBY_VERSION=$rubyversion" |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
43 |
- rubylibs=`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG["LIBS"]'` |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
44 |
+ rubylibs=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig::CONFIG['LIBS']"` |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
45 |
if test "X$rubylibs" != "X"; then |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
46 |
RUBY_LIBS="$rubylibs" |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
47 |
fi |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
48 |
- librubyarg=`$vi_cv_path_ruby -r rbconfig -e 'print Config.expand(Config::CONFIG["LIBRUBYARG"])'` |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
49 |
- librubya=`$vi_cv_path_ruby -r rbconfig -e 'print Config.expand(Config::CONFIG["LIBRUBY_A"])'` |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
50 |
- rubylibdir=`$vi_cv_path_ruby -r rbconfig -e 'print Config.expand(Config::CONFIG["libdir"])'` |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
51 |
+ librubyarg=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG['LIBRUBYARG'])"` |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
52 |
+ librubya=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG['LIBRUBY_A'])"` |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
53 |
+ rubylibdir=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG['libdir'])"` |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
54 |
if test -f "$rubylibdir/$librubya"; then |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
55 |
librubyarg="$librubyarg" |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
56 |
- RUBY_LIBS="$RUBY_LIBS -L$rubylibdir" |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
57 |
- elif test "$librubyarg" = "libruby.a"; then |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
58 |
- librubyarg="-lruby" |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
59 |
- RUBY_LIBS="$RUBY_LIBS -L$rubylibdir" |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
60 |
+ RUBY_LIBS="$RUBY_LIBS -L$rubylibdir" |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
61 |
+ elif test "$librubyarg" = "libruby.a"; then |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
62 |
+ librubyarg="-lruby" |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
63 |
+ RUBY_LIBS="$RUBY_LIBS -L$rubylibdir" |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
64 |
fi |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
65 |
|
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
66 |
if test "X$librubyarg" != "X"; then |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
67 |
RUBY_LIBS="$librubyarg $RUBY_LIBS" |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
68 |
fi |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
69 |
- rubyldflags=`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG["LDFLAGS"]'` |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
70 |
+ rubyldflags=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig::CONFIG['LDFLAGS']"` |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
71 |
if test "X$rubyldflags" != "X"; then |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
72 |
rubyldflags=`echo "$rubyldflags" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//' -e 's/-arch\ x86_64//'` |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
73 |
if test "X$rubyldflags" != "X"; then |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
74 |
- LDFLAGS="$rubyldflags $LDFLAGS" |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
75 |
+ if test "X`echo \"$LDFLAGS\" | grep -F -e \"$rubyldflags\"`" = "X"; then |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
76 |
+ LDFLAGS="$rubyldflags $LDFLAGS" |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
77 |
+ fi |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
78 |
fi |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
79 |
fi |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
80 |
RUBY_SRC="if_ruby.c" |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
81 |
@@ -6371,7 +6384,7 @@ |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
82 |
$as_echo "#define FEAT_RUBY 1" >>confdefs.h |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
83 |
|
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
84 |
if test "$enable_rubyinterp" = "dynamic"; then |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
85 |
- libruby=`$vi_cv_path_ruby -r rbconfig -e 'printf "lib%s.%s\n", Config::CONFIG["RUBY_SO_NAME"], Config::CONFIG["DLEXT"]'` |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
86 |
+ libruby=`$vi_cv_path_ruby -r rbconfig -e "puts $ruby_rbconfig::CONFIG['LIBRUBY_SO']"` |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
87 |
$as_echo "#define DYNAMIC_RUBY 1" >>confdefs.h |
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
88 |
|
5e5034b03491
17409417 change vim to use ruby 1.9.3 instead of ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
89 |
RUBY_CFLAGS="-DDYNAMIC_RUBY_DLL=\\\"$libruby\\\" -DDYNAMIC_RUBY_VER=$rubyversion $RUBY_CFLAGS" |