Skip to content

Commit

Permalink
[BZ #407]
Browse files Browse the repository at this point in the history
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].
  • Loading branch information
Ulrich Drepper committed Sep 26, 2004
1 parent c4e328a commit 610e3e7
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
4 changes: 4 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
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
environment. [BZ #384]

Expand Down
7 changes: 3 additions & 4 deletions scripts/test-installation.pl
Original file line number Diff line number Diff line change
@@ -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.

Expand Down Expand Up @@ -168,9 +168,8 @@ sub installation_problem {
}
}
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";
Expand Down

0 comments on commit 610e3e7

Please sign in to comment.