]>
Commit | Line | Data |
---|---|---|
59ab3540 AM |
1 | To: vim_dev@googlegroups.com |
2 | Subject: Patch 7.3.291 | |
3 | Fcc: outbox | |
4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
5 | Mime-Version: 1.0 | |
6 | Content-Type: text/plain; charset=UTF-8 | |
7 | Content-Transfer-Encoding: 8bit | |
8 | ------------ | |
9 | ||
10 | Patch 7.3.291 | |
11 | Problem: Configure doesn't work properly with Python3. | |
12 | Solution: Put -ldl before $LDFLAGS. Add PY3_NO_RTLD_GLOBAL. (Roland | |
13 | Puntaier) | |
14 | Files: src/config.h.in, src/auto/configure, src/configure.in | |
15 | ||
16 | ||
17 | *** ../vim-7.3.290/src/config.h.in 2010-10-27 16:49:41.000000000 +0200 | |
18 | --- src/config.h.in 2011-09-02 11:22:21.000000000 +0200 | |
19 | *************** | |
20 | *** 346,351 **** | |
21 | --- 346,354 ---- | |
22 | /* Define if dynamic python does not require RTLD_GLOBAL */ | |
23 | #undef PY_NO_RTLD_GLOBAL | |
24 | ||
25 | + /* Define if dynamic python3 does not require RTLD_GLOBAL */ | |
26 | + #undef PY3_NO_RTLD_GLOBAL | |
27 | + | |
28 | /* Define if you want to include the Ruby interpreter. */ | |
29 | #undef FEAT_RUBY | |
30 | ||
31 | *** ../vim-7.3.290/src/auto/configure 2011-07-15 13:09:46.000000000 +0200 | |
32 | --- src/auto/configure 2011-09-02 11:23:15.000000000 +0200 | |
33 | *************** | |
34 | *** 5733,5739 **** | |
35 | cflags_save=$CFLAGS | |
36 | CFLAGS="$CFLAGS $PYTHON_CFLAGS" | |
37 | ldflags_save=$LDFLAGS | |
38 | ! LDFLAGS="$LDFLAGS -ldl" | |
39 | if test "$cross_compiling" = yes; then : | |
40 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | |
41 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | |
42 | --- 5733,5739 ---- | |
43 | cflags_save=$CFLAGS | |
44 | CFLAGS="$CFLAGS $PYTHON_CFLAGS" | |
45 | ldflags_save=$LDFLAGS | |
46 | ! LDFLAGS="-ldl $LDFLAGS" | |
47 | if test "$cross_compiling" = yes; then : | |
48 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | |
49 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | |
50 | *************** | |
51 | *** 5798,5804 **** | |
52 | cflags_save=$CFLAGS | |
53 | CFLAGS="$CFLAGS $PYTHON3_CFLAGS" | |
54 | ldflags_save=$LDFLAGS | |
55 | ! LDFLAGS="$LDFLAGS -ldl" | |
56 | if test "$cross_compiling" = yes; then : | |
57 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | |
58 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | |
59 | --- 5798,5804 ---- | |
60 | cflags_save=$CFLAGS | |
61 | CFLAGS="$CFLAGS $PYTHON3_CFLAGS" | |
62 | ldflags_save=$LDFLAGS | |
63 | ! LDFLAGS="-ldl $LDFLAGS" | |
64 | if test "$cross_compiling" = yes; then : | |
65 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | |
66 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | |
67 | *** ../vim-7.3.290/src/configure.in 2011-07-15 13:09:46.000000000 +0200 | |
68 | --- src/configure.in 2011-09-02 11:19:51.000000000 +0200 | |
69 | *************** | |
70 | *** 1161,1167 **** | |
71 | cflags_save=$CFLAGS | |
72 | CFLAGS="$CFLAGS $PYTHON_CFLAGS" | |
73 | ldflags_save=$LDFLAGS | |
74 | ! LDFLAGS="$LDFLAGS -ldl" | |
75 | AC_RUN_IFELSE([ | |
76 | #include <dlfcn.h> | |
77 | /* If this program fails, then RTLD_GLOBAL is needed. | |
78 | --- 1161,1168 ---- | |
79 | cflags_save=$CFLAGS | |
80 | CFLAGS="$CFLAGS $PYTHON_CFLAGS" | |
81 | ldflags_save=$LDFLAGS | |
82 | ! dnl -ldl must go first to make this work on Archlinux (Roland Puntaier) | |
83 | ! LDFLAGS="-ldl $LDFLAGS" | |
84 | AC_RUN_IFELSE([ | |
85 | #include <dlfcn.h> | |
86 | /* If this program fails, then RTLD_GLOBAL is needed. | |
87 | *************** | |
88 | *** 1205,1211 **** | |
89 | cflags_save=$CFLAGS | |
90 | CFLAGS="$CFLAGS $PYTHON3_CFLAGS" | |
91 | ldflags_save=$LDFLAGS | |
92 | ! LDFLAGS="$LDFLAGS -ldl" | |
93 | AC_RUN_IFELSE([ | |
94 | #include <dlfcn.h> | |
95 | #include <wchar.h> | |
96 | --- 1206,1213 ---- | |
97 | cflags_save=$CFLAGS | |
98 | CFLAGS="$CFLAGS $PYTHON3_CFLAGS" | |
99 | ldflags_save=$LDFLAGS | |
100 | ! dnl -ldl must go first to make this work on Archlinux (Roland Puntaier) | |
101 | ! LDFLAGS="-ldl $LDFLAGS" | |
102 | AC_RUN_IFELSE([ | |
103 | #include <dlfcn.h> | |
104 | #include <wchar.h> | |
105 | *** ../vim-7.3.290/src/version.c 2011-09-02 11:56:15.000000000 +0200 | |
106 | --- src/version.c 2011-09-02 12:25:13.000000000 +0200 | |
107 | *************** | |
108 | *** 711,712 **** | |
109 | --- 711,714 ---- | |
110 | { /* Add new patch number below this line */ | |
111 | + /**/ | |
112 | + 291, | |
113 | /**/ | |
114 | ||
115 | -- | |
116 | DENNIS: Look, strange women lying on their backs in ponds handing out | |
117 | swords ... that's no basis for a system of government. Supreme | |
118 | executive power derives from a mandate from the masses, not from some | |
119 | farcical aquatic ceremony. | |
120 | "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD | |
121 | ||
122 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
123 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
124 | \\\ an exciting new programming language -- http://www.Zimbu.org /// | |
125 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |