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

patch 7.4.1190

Browse Source 
Problem:    On OSX the default flag for dlopen() is different.
Solution:   Add RTLD_LOCAL in the configure check. (sv99, closes #604)
This commit is contained in:
Bram Moolenaar 2016-01-28 15:34:25 +01:00
parent 923e43b837
commit ba59ddbd36
3 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/auto/configure vendored
View File

@ -5991,7 +5991,9 @@ eof
fi fi
if ${vi_cv_dll_name_python+:} false; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python's dll name" >&5
$as_echo_n "checking Python's dll name... " >&6; }
if ${vi_cv_dll_name_python+:} false; then :
$as_echo_n "(cached) " >&6 $as_echo_n "(cached) " >&6
else else
@ -6002,7 +6004,8 @@ else
fi fi
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_dll_name_python" >&5
$as_echo "$vi_cv_dll_name_python" >&6; }
PYTHON_LIBS="${vi_cv_path_python_plibs}" PYTHON_LIBS="${vi_cv_path_python_plibs}"
if test "${vi_cv_path_python_pfx}" = "${vi_cv_path_python_epfx}"; then if test "${vi_cv_path_python_pfx}" = "${vi_cv_path_python_epfx}"; then
@ -6320,7 +6323,9 @@ eof
fi fi
if ${vi_cv_dll_name_python3+:} false; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python3's dll name" >&5
$as_echo_n "checking Python3's dll name... " >&6; }
if ${vi_cv_dll_name_python3+:} false; then :
$as_echo_n "(cached) " >&6 $as_echo_n "(cached) " >&6
else else
@ -6331,7 +6336,8 @@ else
fi fi
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_dll_name_python3" >&5
$as_echo "$vi_cv_dll_name_python3" >&6; }
PYTHON3_LIBS="${vi_cv_path_python3_plibs}" PYTHON3_LIBS="${vi_cv_path_python3_plibs}"
if test "${vi_cv_path_python3_pfx}" = "${vi_cv_path_python3_epfx}"; then if test "${vi_cv_path_python3_pfx}" = "${vi_cv_path_python3_epfx}"; then
@ -6473,7 +6479,7 @@ else
int no_rtl_global_needed_for(char *python_instsoname, char *prefix) int no_rtl_global_needed_for(char *python_instsoname, char *prefix)
{ {
int needed = 0; int needed = 0;
void* pylib = dlopen(python_instsoname, RTLD_LAZY); void* pylib = dlopen(python_instsoname, RTLD_LAZY|RTLD_LOCAL);
if (pylib != 0) if (pylib != 0)
{ {
void (*pfx)(char *home) = dlsym(pylib, "Py_SetPythonHome"); void (*pfx)(char *home) = dlsym(pylib, "Py_SetPythonHome");
@ -6539,7 +6545,7 @@ else
int no_rtl_global_needed_for(char *python_instsoname, wchar_t *prefix) int no_rtl_global_needed_for(char *python_instsoname, wchar_t *prefix)
{ {
int needed = 0; int needed = 0;
void* pylib = dlopen(python_instsoname, RTLD_LAZY); void* pylib = dlopen(python_instsoname, RTLD_LAZY|RTLD_LOCAL);
if (pylib != 0) if (pylib != 0)
{ {
void (*pfx)(wchar_t *home) = dlsym(pylib, "Py_SetPythonHome"); void (*pfx)(wchar_t *home) = dlsym(pylib, "Py_SetPythonHome");

8
src/configure.in
View File

@ -1219,7 +1219,7 @@ eof
vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//` vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
fi fi
]) ])
AC_CACHE_VAL(vi_cv_dll_name_python, AC_CACHE_CHECK(Python's dll name,vi_cv_dll_name_python,
[ [
if test "X$python_DLLLIBRARY" != "X"; then if test "X$python_DLLLIBRARY" != "X"; then
vi_cv_dll_name_python="$python_DLLLIBRARY" vi_cv_dll_name_python="$python_DLLLIBRARY"
@ -1428,7 +1428,7 @@ eof
vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-ltermcap//` vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-ltermcap//`
vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-lffi//` vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-lffi//`
]) ])
AC_CACHE_VAL(vi_cv_dll_name_python3, AC_CACHE_CHECK(Python3's dll name,vi_cv_dll_name_python3,
[ [
if test "X$python3_DLLLIBRARY" != "X"; then if test "X$python3_DLLLIBRARY" != "X"; then
vi_cv_dll_name_python3="$python3_DLLLIBRARY" vi_cv_dll_name_python3="$python3_DLLLIBRARY"
@ -1540,7 +1540,7 @@ if test "$python_ok" = yes && test "$python3_ok" = yes; then
int no_rtl_global_needed_for(char *python_instsoname, char *prefix) int no_rtl_global_needed_for(char *python_instsoname, char *prefix)
{ {
int needed = 0; int needed = 0;
void* pylib = dlopen(python_instsoname, RTLD_LAZY); void* pylib = dlopen(python_instsoname, RTLD_LAZY|RTLD_LOCAL);
if (pylib != 0) if (pylib != 0)
{ {
void (*pfx)(char *home) = dlsym(pylib, "Py_SetPythonHome"); void (*pfx)(char *home) = dlsym(pylib, "Py_SetPythonHome");
@ -1586,7 +1586,7 @@ if test "$python_ok" = yes && test "$python3_ok" = yes; then
int no_rtl_global_needed_for(char *python_instsoname, wchar_t *prefix) int no_rtl_global_needed_for(char *python_instsoname, wchar_t *prefix)
{ {
int needed = 0; int needed = 0;
void* pylib = dlopen(python_instsoname, RTLD_LAZY); void* pylib = dlopen(python_instsoname, RTLD_LAZY|RTLD_LOCAL);
if (pylib != 0) if (pylib != 0)
{ {
void (*pfx)(wchar_t *home) = dlsym(pylib, "Py_SetPythonHome"); void (*pfx)(wchar_t *home) = dlsym(pylib, "Py_SetPythonHome");

2
src/version.c
View File

@ -746,6 +746,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 */
/**/
1190,
/**/ /**/
1189, 1189,
/**/ /**/