libltdl: Fix libltdl early failures for multi-arch Since there could be multiple files for libltdl to try dlopening, libltdl should not fail after the first attempted file. Reported: https://savannah.gnu.org/support/?111214 * libltdl/ltdl.c: Change return if dlopen() fails. * libltdl/ltdl.mk: Update serial.
diff --git a/libltdl/ltdl.c b/libltdl/ltdl.c index 74bfe43..6049541 100644 --- a/libltdl/ltdl.c +++ b/libltdl/ltdl.c
@@ -785,10 +785,9 @@ if (notfound) return 0; - /* Try to dlopen the file, but do not continue searching in any - case. */ + /* Try to dlopen the file. */ if (tryall_dlopen (phandle, filename, advise, 0) != 0) - *phandle = 0; + return 0; return 1; }
diff --git a/libltdl/ltdl.mk b/libltdl/ltdl.mk index 4610977..0cb427d 100644 --- a/libltdl/ltdl.mk +++ b/libltdl/ltdl.mk
@@ -35,7 +35,7 @@ -I$(srcdir)/libltdl -Ilibltdl/libltdl \ -I$(srcdir)/libltdl/libltdl AM_LDFLAGS += -no-undefined -LTDL_VERSION_INFO = -version-info 10:4:3 +LTDL_VERSION_INFO = -version-info 10:5:3 noinst_LTLIBRARIES += $(LT_DLLOADERS)