Commit 9e60c2aa by Jakub Jelinek Committed by Jakub Jelinek

acinclude.m4: Regenerated to pick: 2007-06-22 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

	* acinclude.m4: Regenerated to pick:
	2007-06-22 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

	* libtool.m4 (AC_LIBTOOL_SYS_DYNAMIC_LINKER) [linux]:
	Ignore lines in ld.so.conf starting with 'hwcap '.

	* configure: Regenerated.

	2009-11-24  Peter O'Gorman  <peter@pogma.com>

	Backport of libltdl changes from the 2.2.6b release.
	* ltdl.c: Backport changes.

From-SVN: r155053
parent d59b1dcb
2009-12-07 Jakub Jelinek <jakub@redhat.com>
* acinclude.m4: Regenerated to pick:
2007-06-22 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* libtool.m4 (AC_LIBTOOL_SYS_DYNAMIC_LINKER) [linux]:
Ignore lines in ld.so.conf starting with 'hwcap '.
* configure: Regenerated.
2009-11-24 Peter O'Gorman <peter@pogma.com>
Backport of libltdl changes from the 2.2.6b release.
* ltdl.c: Backport changes.
2009-09-22 Dave Korn <dave.korn.cygwin@gmail.com> 2009-09-22 Dave Korn <dave.korn.cygwin@gmail.com>
* ltdl.h (LT_SCOPE): Change conditional to avoid breaking * ltdl.h (LT_SCOPE): Change conditional to avoid breaking
......
...@@ -1527,7 +1527,7 @@ linux*) ...@@ -1527,7 +1527,7 @@ linux*)
# Append ld.so.conf contents to the search path # Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
fi fi
......
...@@ -9160,7 +9160,7 @@ linux*) ...@@ -9160,7 +9160,7 @@ linux*)
# Append ld.so.conf contents to the search path # Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
fi fi
...@@ -12576,7 +12576,7 @@ linux*) ...@@ -12576,7 +12576,7 @@ linux*)
# Append ld.so.conf contents to the search path # Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
fi fi
...@@ -15489,7 +15489,7 @@ linux*) ...@@ -15489,7 +15489,7 @@ linux*)
# Append ld.so.conf contents to the search path # Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
fi fi
...@@ -17916,7 +17916,7 @@ linux*) ...@@ -17916,7 +17916,7 @@ linux*)
# Append ld.so.conf contents to the search path # Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
fi fi
......
...@@ -2175,7 +2175,8 @@ static int trim LT_PARAMS((char **dest, ...@@ -2175,7 +2175,8 @@ static int trim LT_PARAMS((char **dest,
static int try_dlopen LT_PARAMS((lt_dlhandle *handle, static int try_dlopen LT_PARAMS((lt_dlhandle *handle,
const char *filename)); const char *filename));
static int tryall_dlopen LT_PARAMS((lt_dlhandle *handle, static int tryall_dlopen LT_PARAMS((lt_dlhandle *handle,
const char *filename)); const char *filename,
const char * useloader));
static int unload_deplibs LT_PARAMS((lt_dlhandle handle)); static int unload_deplibs LT_PARAMS((lt_dlhandle handle));
static int lt_argz_insert LT_PARAMS((char **pargz, static int lt_argz_insert LT_PARAMS((char **pargz,
size_t *pargz_len, size_t *pargz_len,
...@@ -2361,9 +2362,10 @@ lt_dlexit () ...@@ -2361,9 +2362,10 @@ lt_dlexit ()
} }
static int static int
tryall_dlopen (handle, filename) tryall_dlopen (handle, filename, useloader)
lt_dlhandle *handle; lt_dlhandle *handle;
const char *filename; const char *filename;
const char *useloader;
{ {
lt_dlhandle cur; lt_dlhandle cur;
lt_dlloader *loader; lt_dlloader *loader;
...@@ -2430,6 +2432,11 @@ tryall_dlopen (handle, filename) ...@@ -2430,6 +2432,11 @@ tryall_dlopen (handle, filename)
while (loader) while (loader)
{ {
if (useloader && strcmp(loader->loader_name, useloader))
{
loader = loader->next;
continue;
}
lt_user_data data = loader->dlloader_data; lt_user_data data = loader->dlloader_data;
cur->module = loader->module_open (data, filename); cur->module = loader->module_open (data, filename);
...@@ -2499,7 +2506,7 @@ tryall_dlopen_module (handle, prefix, dirname, dlname) ...@@ -2499,7 +2506,7 @@ tryall_dlopen_module (handle, prefix, dirname, dlname)
error += tryall_dlopen_module (handle, error += tryall_dlopen_module (handle,
(const char *) 0, prefix, filename); (const char *) 0, prefix, filename);
} }
else if (tryall_dlopen (handle, filename) != 0) else if (tryall_dlopen (handle, filename, NULL) != 0)
{ {
++error; ++error;
} }
...@@ -2520,7 +2527,7 @@ find_module (handle, dir, libdir, dlname, old_name, installed) ...@@ -2520,7 +2527,7 @@ find_module (handle, dir, libdir, dlname, old_name, installed)
/* Try to open the old library first; if it was dlpreopened, /* Try to open the old library first; if it was dlpreopened,
we want the preopened version of it, even if a dlopenable we want the preopened version of it, even if a dlopenable
module is available. */ module is available. */
if (old_name && tryall_dlopen (handle, old_name) == 0) if (old_name && tryall_dlopen (handle, old_name, "dlpreload") == 0)
{ {
return 0; return 0;
} }
...@@ -2784,7 +2791,7 @@ find_handle_callback (filename, data, ignored) ...@@ -2784,7 +2791,7 @@ find_handle_callback (filename, data, ignored)
/* Try to dlopen the file, but do not continue searching in any /* Try to dlopen the file, but do not continue searching in any
case. */ case. */
if (tryall_dlopen (handle, filename) != 0) if (tryall_dlopen (handle, filename,NULL) != 0)
*handle = 0; *handle = 0;
return 1; return 1;
...@@ -3072,7 +3079,7 @@ try_dlopen (phandle, filename) ...@@ -3072,7 +3079,7 @@ try_dlopen (phandle, filename)
/* lt_dlclose()ing yourself is very bad! Disallow it. */ /* lt_dlclose()ing yourself is very bad! Disallow it. */
LT_DLSET_FLAG (*phandle, LT_DLRESIDENT_FLAG); LT_DLSET_FLAG (*phandle, LT_DLRESIDENT_FLAG);
if (tryall_dlopen (&newhandle, 0) != 0) if (tryall_dlopen (&newhandle, 0, NULL) != 0)
{ {
LT_DLFREE (*phandle); LT_DLFREE (*phandle);
return 1; return 1;
...@@ -3194,7 +3201,7 @@ try_dlopen (phandle, filename) ...@@ -3194,7 +3201,7 @@ try_dlopen (phandle, filename)
} }
#endif #endif
} }
if (!file) else
{ {
file = fopen (filename, LT_READTEXT_MODE); file = fopen (filename, LT_READTEXT_MODE);
} }
...@@ -3378,7 +3385,7 @@ try_dlopen (phandle, filename) ...@@ -3378,7 +3385,7 @@ try_dlopen (phandle, filename)
#endif #endif
))) )))
{ {
if (tryall_dlopen (&newhandle, filename) != 0) if (tryall_dlopen (&newhandle, filename, NULL) != 0)
{ {
newhandle = NULL; newhandle = NULL;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment