diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2004-09-26 12:50:39 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2004-09-26 12:50:39 +0000 |
| commit | 610e3e7f859b3e07dff91063ecbbdbb2f34ef4e7 (patch) | |
| tree | ead9d124f84c89778b0ab1fed38c04c9ca2209d8 /scripts/test-installation.pl | |
| parent | c4e328a12e1ddbdf9c5dbede56beb826d50f2776 (diff) | |
| download | glibc-610e3e7f859b3e07dff91063ecbbdbb2f34ef4e7.tar.gz glibc-610e3e7f859b3e07dff91063ecbbdbb2f34ef4e7.tar.xz glibc-610e3e7f859b3e07dff91063ecbbdbb2f34ef4e7.zip | |
[BZ #407]
Update. * scripts/test-installation.pl: Fix ld.so recognition for new LD_TRACE_LOADED_OBJECTS output format. Patch by <jsberg04+computing.glibc@ftml.net> [BZ #407].
Diffstat (limited to 'scripts/test-installation.pl')
| -rwxr-xr-x | scripts/test-installation.pl | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/scripts/test-installation.pl b/scripts/test-installation.pl index 981c2ccada..90cd9d7547 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 <aj@arthur.rhein-neckar.de>, 1997. @@ -168,9 +168,8 @@ while (<LDD>) { } } 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"; |