|
1 To: [email protected] |
|
2 Subject: Patch 7.2.236 |
|
3 Fcc: outbox |
|
4 From: Bram Moolenaar <[email protected]> |
|
5 Mime-Version: 1.0 |
|
6 Content-Type: text/plain; charset=UTF-8 |
|
7 Content-Transfer-Encoding: 8bit |
|
8 ------------ |
|
9 |
|
10 Patch 7.2.236 |
|
11 Problem: Mac: Compiling with Ruby doesn't always work. |
|
12 Solution: In configure filter out the --arch argument (Bjorn Winckler) |
|
13 Files: src/configure.in, src/auto/configure |
|
14 |
|
15 |
|
16 *** ../vim-7.2.235/src/configure.in 2009-05-26 22:58:43.000000000 +0200 |
|
17 --- src/configure.in 2009-07-14 16:09:34.000000000 +0200 |
|
18 *************** |
|
19 *** 984,990 **** |
|
20 fi |
|
21 rubyldflags=`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG[["LDFLAGS"]]'` |
|
22 if test "X$rubyldflags" != "X"; then |
|
23 ! LDFLAGS="$rubyldflags $LDFLAGS" |
|
24 fi |
|
25 RUBY_SRC="if_ruby.c" |
|
26 RUBY_OBJ="objects/if_ruby.o" |
|
27 --- 984,996 ---- |
|
28 fi |
|
29 rubyldflags=`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG[["LDFLAGS"]]'` |
|
30 if test "X$rubyldflags" != "X"; then |
|
31 ! dnl Ruby on Mac OS X 10.5 adds "-arch" flags but these should only |
|
32 ! dnl be included if requested by passing --with-mac-arch to |
|
33 ! dnl configure, so strip these flags first (if present) |
|
34 ! rubyldflags=`echo "$rubyldflags" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//'` |
|
35 ! if test "X$rubyldflags" != "X"; then |
|
36 ! LDFLAGS="$rubyldflags $LDFLAGS" |
|
37 ! fi |
|
38 fi |
|
39 RUBY_SRC="if_ruby.c" |
|
40 RUBY_OBJ="objects/if_ruby.o" |
|
41 *** ../vim-7.2.235/src/auto/configure 2009-05-26 22:58:43.000000000 +0200 |
|
42 --- src/auto/configure 2009-07-14 16:11:58.000000000 +0200 |
|
43 *************** |
|
44 *** 5780,5786 **** |
|
45 fi |
|
46 rubyldflags=`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG["LDFLAGS"]'` |
|
47 if test "X$rubyldflags" != "X"; then |
|
48 ! LDFLAGS="$rubyldflags $LDFLAGS" |
|
49 fi |
|
50 RUBY_SRC="if_ruby.c" |
|
51 RUBY_OBJ="objects/if_ruby.o" |
|
52 --- 5780,5789 ---- |
|
53 fi |
|
54 rubyldflags=`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG["LDFLAGS"]'` |
|
55 if test "X$rubyldflags" != "X"; then |
|
56 ! rubyldflags=`echo "$rubyldflags" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//'` |
|
57 ! if test "X$rubyldflags" != "X"; then |
|
58 ! LDFLAGS="$rubyldflags $LDFLAGS" |
|
59 ! fi |
|
60 fi |
|
61 RUBY_SRC="if_ruby.c" |
|
62 RUBY_OBJ="objects/if_ruby.o" |
|
63 *** ../vim-7.2.235/src/version.c 2009-07-22 11:03:38.000000000 +0200 |
|
64 --- src/version.c 2009-07-22 11:14:38.000000000 +0200 |
|
65 *************** |
|
66 *** 678,679 **** |
|
67 --- 678,681 ---- |
|
68 { /* Add new patch number below this line */ |
|
69 + /**/ |
|
70 + 236, |
|
71 /**/ |
|
72 |
|
73 -- |
|
74 From "know your smileys": |
|
75 <|-) Chinese |
|
76 <|-( Chinese and doesn't like these kind of jokes |
|
77 |
|
78 /// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\ |
|
79 /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ |
|
80 \\\ download, build and distribute -- http://www.A-A-P.org /// |
|
81 \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |