From b15ff9d65ed1b730e2aa648b4dceff5638072b4f Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Fri, 16 Mar 2001 09:59:58 +0000 Subject: [PATCH] Update. 2001-03-16 Jakub Jelinek * elf/ldconfig.c (search_dir): Remove bogus diagnostic, instead update osversion from more recent library. --- ChangeLog | 5 +++++ elf/ldconfig.c | 6 +----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index a1bd493..adf6dc8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-03-16 Jakub Jelinek + + * elf/ldconfig.c (search_dir): Remove bogus diagnostic, instead + update osversion from more recent library. + 2001-03-13 Martin Schwidefsky * sysdeps/unix/sysv/linux/s390/Dist: Move to... diff --git a/elf/ldconfig.c b/elf/ldconfig.c index d3c5355..da22101 100644 --- a/elf/ldconfig.c +++ b/elf/ldconfig.c @@ -758,12 +758,8 @@ search_dir (const struct dir_entry *entry) error (0, 0, _("libraries %s and %s in directory %s have same soname but different type."), dlib_ptr->name, direntry->d_name, entry->path); } - /* OS version should be the same - sanity check. */ - if (dlib_ptr->osversion != osversion) - error (0, 0, _("libraries %s and %s in directory %s have same\n" - "soname but different minimal supported OS version."), - dlib_ptr->name, direntry->d_name, entry->path); free (dlib_ptr->name); + dlib_ptr->osversion = osversion; dlib_ptr->name = xstrdup (direntry->d_name); dlib_ptr->is_link = is_link; } -- 2.7.4