diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2001-03-16 09:59:58 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2001-03-16 09:59:58 +0000 |
| commit | b15ff9d65ed1b730e2aa648b4dceff5638072b4f (patch) | |
| tree | d3a5aeb36f46ce42f9dd4e542857e3a3cb2020ca | |
| parent | ffeac41785dc86f48b0241af27f0bcf6d8307bf5 (diff) | |
| download | glibc-b15ff9d65ed1b730e2aa648b4dceff5638072b4f.tar.gz glibc-b15ff9d65ed1b730e2aa648b4dceff5638072b4f.tar.xz glibc-b15ff9d65ed1b730e2aa648b4dceff5638072b4f.zip | |
Update.
2001-03-16 Jakub Jelinek <jakub@redhat.com> * elf/ldconfig.c (search_dir): Remove bogus diagnostic, instead update osversion from more recent library.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | elf/ldconfig.c | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index a1bd4933be..adf6dc89b3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-03-16 Jakub Jelinek <jakub@redhat.com> + + * elf/ldconfig.c (search_dir): Remove bogus diagnostic, instead + update osversion from more recent library. + 2001-03-13 Martin Schwidefsky <schwidefsky@de.ibm.com> * sysdeps/unix/sysv/linux/s390/Dist: Move to... diff --git a/elf/ldconfig.c b/elf/ldconfig.c index d3c5355156..da221012fb 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; } |