AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove checks for shl_load() from configure/CMake

Browse Source 
This function is not used any more since e289eb07e1 (Get rid of
non-POSIX code for loading dynlibs on *nix, 2020-05-13), so don't check
for it and don't defined the corresponding HAVE_SHL_LOAD symbol.
This commit is contained in:
Vadim Zeitlin 2020-05-14 23:56:03 +02:00
parent 2e6fec3601
commit fea8c608b1
7 changed files with 0 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/cmake/setup.cmake
View File

@ -616,8 +616,6 @@ cmake_pop_check_state()
if(HAVE_DLOPEN)
check_symbol_exists(dlerror dlfcn.h HAVE_DLERROR)
check_symbol_exists(dladdr dlfcn.h HAVE_DLADDR)
else()
check_symbol_exists(shl_load dl.h HAVE_SHL_LOAD)
endif()
check_function_exists(gettimeofday HAVE_GETTIMEOFDAY)

3
build/cmake/setup.h.in
View File

@ -984,9 +984,6 @@
/* Define if you have pthread_attr_setstacksize */
#cmakedefine HAVE_PTHREAD_ATTR_SETSTACKSIZE 1
/* Define if you have shl_load() */
#cmakedefine HAVE_SHL_LOAD 1
/* Define if you have snprintf() */
#cmakedefine HAVE_SNPRINTF 1

64
configure vendored
View File

@ -32736,70 +32736,6 @@ if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
HAVE_DL_FUNCS=1
DL_LINK="-ldl $DL_LINK"
else
for ac_func in shl_load
do :
ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
if test "x$ac_cv_func_shl_load" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_SHL_LOAD 1
_ACEOF
$as_echo "#define HAVE_SHL_LOAD 1" >>confdefs.h
HAVE_SHL_FUNCS=1
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld in -lshl_load" >&5
$as_echo_n "checking for dld in -lshl_load... " >&6; }
if ${ac_cv_lib_shl_load_dld+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lshl_load $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char dld ();
int
main ()
{
return dld ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_shl_load_dld=yes
else
ac_cv_lib_shl_load_dld=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_shl_load_dld" >&5
$as_echo "$ac_cv_lib_shl_load_dld" >&6; }
if test "x$ac_cv_lib_shl_load_dld" = xyes; then :
HAVE_SHL_FUNCS=1
DL_LINK="-ldld $DL_LINK"
fi
fi
done
fi

14
configure.in
View File

@ -5385,20 +5385,6 @@ if test "$TOOLKIT" != "MSW"; then
AC_DEFINE(HAVE_DLOPEN)
HAVE_DL_FUNCS=1
DL_LINK="-ldl $DL_LINK"
],
[
AC_CHECK_FUNCS(shl_load,
[
AC_DEFINE(HAVE_SHL_LOAD)
HAVE_SHL_FUNCS=1
],
[
AC_CHECK_LIB(shl_load, dld,
[
HAVE_SHL_FUNCS=1
DL_LINK="-ldld $DL_LINK"
])
])
])
])

3
include/wx/dynlib.h
View File

@ -29,9 +29,6 @@ class WXDLLIMPEXP_FWD_BASE wxDynamicLibraryDetailsCreator;
#elif defined(HAVE_DLOPEN)
#include <dlfcn.h>
typedef void *wxDllType;
#elif defined(HAVE_SHL_LOAD)
#include <dl.h>
typedef shl_t wxDllType;
#elif defined(__WXMAC__)
#include <CodeFragments.h>
typedef CFragConnectionID wxDllType;

3
setup.h.in
View File

@ -984,9 +984,6 @@
/* Define if you have pthread_attr_setstacksize */
#undef HAVE_PTHREAD_ATTR_SETSTACKSIZE
/* Define if you have shl_load() */
#undef HAVE_SHL_LOAD
/* Define if you have snprintf() */
#undef HAVE_SNPRINTF

3
setup.h_vms
View File

@ -1076,9 +1076,6 @@ typedef pid_t GPid;
#undef HAVE_SETENV
#endif
/* Define if you have shl_load() */
#undef HAVE_SHL_LOAD
#if __CRTL_VER >= 70312000
/* Define if you have snprintf() */
#define HAVE_SNPRINTF 1