From 610e3e7f859b3e07dff91063ecbbdbb2f34ef4e7 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sun, 26 Sep 2004 12:50:39 +0000 Subject: [PATCH] [BZ #407] Update. * scripts/test-installation.pl: Fix ld.so recognition for new LD_TRACE_LOADED_OBJECTS output format. Patch by [BZ #407]. --- ChangeLog | 4 ++++ scripts/test-installation.pl | 7 +++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5a923c9..13c49cd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2004-09-26 Ulrich Drepper + * scripts/test-installation.pl: Fix ld.so recognition for new + LD_TRACE_LOADED_OBJECTS output format. + Patch by [BZ #407]. + * elf/dl-support.c (_dl_non_dynamic_init): Fix cleaning of environment. [BZ #384] diff --git a/scripts/test-installation.pl b/scripts/test-installation.pl index 981c2cc..90cd9d7 100755 --- a/scripts/test-installation.pl +++ b/scripts/test-installation.pl @@ -1,5 +1,5 @@ #! /usr/bin/perl -w -# Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc. +# Copyright (C) 1997, 1998, 1999, 2004 Free Software Foundation, Inc. # This file is part of the GNU C Library. # Contributed by Andreas Jaeger , 1997. @@ -168,9 +168,8 @@ while () { } } if (/$ld_so_name/) { - ($version1, $version2) = - /$ld_so_name\.so\.([0-9\.]*)\s*=>.*\.so\.([0-9\.]*)/; - if ($version1 ne $version2 || $version1 ne $ld_so_version) { + ($version1) = /$ld_so_name\.so\.([0-9\.]*)/; + if ($version1 ne $ld_so_version) { print "The dynamic linker $ld_so_name.so is not correctly installed.\n"; print "Please check your installation!\n"; print "Offending line of ldd output: $_\n"; -- 2.7.4