AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-22 19:00:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

[BZ #407]

Browse Source 
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].
This commit is contained in:
Ulrich Drepper 2004-09-26 12:50:39 +00:00
parent c4e328a12e
commit 610e3e7f85
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2004-09-26 Ulrich Drepper <drepper@redhat.com> 2004-09-26 Ulrich Drepper <drepper@redhat.com>
* 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].
* elf/dl-support.c (_dl_non_dynamic_init): Fix cleaning of * elf/dl-support.c (_dl_non_dynamic_init): Fix cleaning of
environment. [BZ #384] environment. [BZ #384]

7
scripts/test-installation.pl
View File

@ -1,5 +1,5 @@
#! /usr/bin/perl -w #! /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. # This file is part of the GNU C Library.
# Contributed by Andreas Jaeger <aj@arthur.rhein-neckar.de>, 1997. # Contributed by Andreas Jaeger <aj@arthur.rhein-neckar.de>, 1997.
@ -168,9 +168,8 @@ while (<LDD>) {
} }
} }
if (/$ld_so_name/) { if (/$ld_so_name/) {
($version1, $version2) = ($version1) = /$ld_so_name\.so\.([0-9\.]*)/;
/$ld_so_name\.so\.([0-9\.]*)\s*=>.*\.so\.([0-9\.]*)/; if ($version1 ne $ld_so_version) {
if ($version1 ne $version2 || $version1 ne $ld_so_version) {
print "The dynamic linker $ld_so_name.so is not correctly installed.\n"; print "The dynamic linker $ld_so_name.so is not correctly installed.\n";
print "Please check your installation!\n"; print "Please check your installation!\n";
print "Offending line of ldd output: $_\n"; print "Offending line of ldd output: $_\n";