aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

updated for version 7.3.291

Browse Source 
Problem:    Configure doesn't work properly with Python3.
Solution:   Put -ldl before $LDFLAGS. Add PY3_NO_RTLD_GLOBAL. (Roland
            Puntaier)
This commit is contained in:
Bram Moolenaar
2011-09-02 12:27:25 +02:00
parent 39fc42ef9d
commit 6fabcbe260
4 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/auto/configure vendored
View File

@@ -5733,7 +5733,7 @@ $as_echo_n "checking whether we can do without RTLD_GLOBAL for Python... " >&6;
cflags_save=$CFLAGS cflags_save=$CFLAGS
CFLAGS="$CFLAGS $PYTHON_CFLAGS" CFLAGS="$CFLAGS $PYTHON_CFLAGS"
ldflags_save=$LDFLAGS ldflags_save=$LDFLAGS
LDFLAGS="$LDFLAGS -ldl" LDFLAGS="-ldl $LDFLAGS"
if test "$cross_compiling" = yes; then : if test "$cross_compiling" = yes; then :
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -5798,7 +5798,7 @@ $as_echo_n "checking whether we can do without RTLD_GLOBAL for Python3... " >&6;
cflags_save=$CFLAGS cflags_save=$CFLAGS
CFLAGS="$CFLAGS $PYTHON3_CFLAGS" CFLAGS="$CFLAGS $PYTHON3_CFLAGS"
ldflags_save=$LDFLAGS ldflags_save=$LDFLAGS
LDFLAGS="$LDFLAGS -ldl" LDFLAGS="-ldl $LDFLAGS"
if test "$cross_compiling" = yes; then : if test "$cross_compiling" = yes; then :
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

3
src/config.h.in
View File

@@ -346,6 +346,9 @@
/* Define if dynamic python does not require RTLD_GLOBAL */ /* Define if dynamic python does not require RTLD_GLOBAL */
#undef PY_NO_RTLD_GLOBAL #undef PY_NO_RTLD_GLOBAL
/* Define if dynamic python3 does not require RTLD_GLOBAL */
#undef PY3_NO_RTLD_GLOBAL
/* Define if you want to include the Ruby interpreter. */ /* Define if you want to include the Ruby interpreter. */
#undef FEAT_RUBY #undef FEAT_RUBY

6
src/configure.in
View File

@@ -1161,7 +1161,8 @@ if test "$python_ok" = yes && test "$python3_ok" = yes; then
cflags_save=$CFLAGS cflags_save=$CFLAGS
CFLAGS="$CFLAGS $PYTHON_CFLAGS" CFLAGS="$CFLAGS $PYTHON_CFLAGS"
ldflags_save=$LDFLAGS ldflags_save=$LDFLAGS
LDFLAGS="$LDFLAGS -ldl" dnl -ldl must go first to make this work on Archlinux (Roland Puntaier)
LDFLAGS="-ldl $LDFLAGS"
AC_RUN_IFELSE([ AC_RUN_IFELSE([
#include <dlfcn.h> #include <dlfcn.h>
/* If this program fails, then RTLD_GLOBAL is needed. /* If this program fails, then RTLD_GLOBAL is needed.
@@ -1205,7 +1206,8 @@ if test "$python_ok" = yes && test "$python3_ok" = yes; then
cflags_save=$CFLAGS cflags_save=$CFLAGS
CFLAGS="$CFLAGS $PYTHON3_CFLAGS" CFLAGS="$CFLAGS $PYTHON3_CFLAGS"
ldflags_save=$LDFLAGS ldflags_save=$LDFLAGS
LDFLAGS="$LDFLAGS -ldl" dnl -ldl must go first to make this work on Archlinux (Roland Puntaier)
LDFLAGS="-ldl $LDFLAGS"
AC_RUN_IFELSE([ AC_RUN_IFELSE([
#include <dlfcn.h> #include <dlfcn.h>
#include <wchar.h> #include <wchar.h>

2
src/version.c
View File

@@ -709,6 +709,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
291,
/**/ /**/
290, 290,
/**/ /**/