aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-26 04:04:07 -04:00
Code Activity

updated for version 7.4.650

Browse Source 
Problem:    Configure check may fail because the dl library is not used.
Solution:   Put "-ldl" in LIBS rather than LDFLAGS. (Oazki Kiichi)
This commit is contained in:
Bram Moolenaar
2015-03-05 16:47:20 +01:00
parent cf48767cd1
commit 5d3fbf3bfe
3 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/auto/configure vendored
View File

@@ -6367,8 +6367,8 @@ if test "$python_ok" = yes && test "$python3_ok" = yes; then
$as_echo_n "checking whether we can do without RTLD_GLOBAL for Python... " >&6; } $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 libs_save=$LIBS
LDFLAGS="-ldl $LDFLAGS" LIBS="-ldl $LIBS"
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;}
@@ -6426,14 +6426,14 @@ fi
CFLAGS=$cflags_save CFLAGS=$cflags_save
LDFLAGS=$ldflags_save LIBS=$libs_save
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can do without RTLD_GLOBAL for Python3" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can do without RTLD_GLOBAL for Python3" >&5
$as_echo_n "checking whether we can do without RTLD_GLOBAL for Python3... " >&6; } $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 libs_save=$LIBS
LDFLAGS="-ldl $LDFLAGS" LIBS="-ldl $LIBS"
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;}
@@ -6492,7 +6492,7 @@ fi
CFLAGS=$cflags_save CFLAGS=$cflags_save
LDFLAGS=$ldflags_save LIBS=$libs_save
PYTHON_SRC="if_python.c" PYTHON_SRC="if_python.c"
PYTHON_OBJ="objects/if_python.o" PYTHON_OBJ="objects/if_python.o"

12
src/configure.in
View File

@@ -1451,9 +1451,9 @@ if test "$python_ok" = yes && test "$python3_ok" = yes; then
AC_MSG_CHECKING(whether we can do without RTLD_GLOBAL for Python) AC_MSG_CHECKING(whether we can do without RTLD_GLOBAL for Python)
cflags_save=$CFLAGS cflags_save=$CFLAGS
CFLAGS="$CFLAGS $PYTHON_CFLAGS" CFLAGS="$CFLAGS $PYTHON_CFLAGS"
ldflags_save=$LDFLAGS libs_save=$LIBS
dnl -ldl must go first to make this work on Archlinux (Roland Puntaier) dnl -ldl must go first to make this work on Archlinux (Roland Puntaier)
LDFLAGS="-ldl $LDFLAGS" LIBS="-ldl $LIBS"
AC_RUN_IFELSE([AC_LANG_SOURCE([ AC_RUN_IFELSE([AC_LANG_SOURCE([
#include <dlfcn.h> #include <dlfcn.h>
/* If this program fails, then RTLD_GLOBAL is needed. /* If this program fails, then RTLD_GLOBAL is needed.
@@ -1491,14 +1491,14 @@ if test "$python_ok" = yes && test "$python3_ok" = yes; then
[AC_MSG_RESULT(yes);AC_DEFINE(PY_NO_RTLD_GLOBAL)], [AC_MSG_RESULT(no)]) [AC_MSG_RESULT(yes);AC_DEFINE(PY_NO_RTLD_GLOBAL)], [AC_MSG_RESULT(no)])
CFLAGS=$cflags_save CFLAGS=$cflags_save
LDFLAGS=$ldflags_save LIBS=$libs_save
AC_MSG_CHECKING(whether we can do without RTLD_GLOBAL for Python3) AC_MSG_CHECKING(whether we can do without RTLD_GLOBAL for Python3)
cflags_save=$CFLAGS cflags_save=$CFLAGS
CFLAGS="$CFLAGS $PYTHON3_CFLAGS" CFLAGS="$CFLAGS $PYTHON3_CFLAGS"
ldflags_save=$LDFLAGS libs_save=$LIBS
dnl -ldl must go first to make this work on Archlinux (Roland Puntaier) dnl -ldl must go first to make this work on Archlinux (Roland Puntaier)
LDFLAGS="-ldl $LDFLAGS" LIBS="-ldl $LIBS"
AC_RUN_IFELSE([AC_LANG_SOURCE([ AC_RUN_IFELSE([AC_LANG_SOURCE([
#include <dlfcn.h> #include <dlfcn.h>
#include <wchar.h> #include <wchar.h>
@@ -1537,7 +1537,7 @@ if test "$python_ok" = yes && test "$python3_ok" = yes; then
[AC_MSG_RESULT(yes);AC_DEFINE(PY3_NO_RTLD_GLOBAL)], [AC_MSG_RESULT(no)]) [AC_MSG_RESULT(yes);AC_DEFINE(PY3_NO_RTLD_GLOBAL)], [AC_MSG_RESULT(no)])
CFLAGS=$cflags_save CFLAGS=$cflags_save
LDFLAGS=$ldflags_save LIBS=$libs_save
PYTHON_SRC="if_python.c" PYTHON_SRC="if_python.c"
PYTHON_OBJ="objects/if_python.o" PYTHON_OBJ="objects/if_python.o"

2
src/version.c
View File

@@ -741,6 +741,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 */
/**/
650,
/**/ /**/
649, 649,
/**/ /**/