[PATCH] ldconfig fix

[Jakub Jelinek <jakub at redhat dot com>]

On Thu, Mar 15, 2001 at 11:47:50PM -0800, Ulrich Drepper wrote:
> I've applied the patch now.  It seemed sufficiently clean.  Thanks,

Thanks a lot.
This is what I had to add yesterday: it is perfectly normal to have
different osversions for one soname in the same library (say have
libc-2.2.1.so and libc-2.2.2.so in the same directory), we just must update
osversion from the library ld.so.cache will actually contain.

2001-03-16  Jakub Jelinek  <jakub@redhat.com>

	* elf/ldconfig.c (search_dir): Remove bogus diagnostic, instead
	update osversion from more recent library.

--- libc/elf/ldconfig.c.jj	Fri Mar 16 10:06:14 2001
+++ libc/elf/ldconfig.c	Fri Mar 16 10:07:08 2001
@@ -758,12 +758,8 @@ search_dir (const struct dir_entry *entr
 			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;
 		}


	Jakub