From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 2F3E2385381E; Thu, 4 Aug 2022 13:04:06 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2F3E2385381E Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc] Remove left over LD_LIBRARY_VERSION usages X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/master X-Git-Oldrev: 8fabe0e632bd441c760f878d1022c378f04f8497 X-Git-Newrev: 5a57ad23ba73be7aefd2c243489330f5cd8d3ca6 Message-Id: <20220804130406.2F3E2385381E@sourceware.org> Date: Thu, 4 Aug 2022 13:04:06 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Aug 2022 13:04:06 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=5a57ad23ba73be7aefd2c243489330f5cd8d3ca6 commit 5a57ad23ba73be7aefd2c243489330f5cd8d3ca6 Author: Adhemerval Zanella Date: Tue Aug 2 10:08:57 2022 -0300 Remove left over LD_LIBRARY_VERSION usages The environment variable was removed by d2db60d8d830ef68c8d20a77ac3572d610aa40b1. Diff: --- sysdeps/unix/sysv/linux/ldd-rewrite.sed | 1 - sysdeps/unix/sysv/linux/powerpc/ldd-rewrite.sed | 3 --- sysdeps/unix/sysv/linux/s390/ldd-rewrite.sed | 3 --- sysdeps/unix/sysv/linux/sparc/ldd-rewrite.sed | 2 -- sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed | 2 -- 5 files changed, 11 deletions(-) diff --git a/sysdeps/unix/sysv/linux/ldd-rewrite.sed b/sysdeps/unix/sysv/linux/ldd-rewrite.sed index 7b8b6bdee0..1faa90fbc8 100644 --- a/sysdeps/unix/sysv/linux/ldd-rewrite.sed +++ b/sysdeps/unix/sysv/linux/ldd-rewrite.sed @@ -8,4 +8,3 @@ fi\ # In case of an error punt. /LD_TRACE_LOADED_OBJECTS=1/a\ -add_env="$add_env LD_LIBRARY_VERSION=\\$verify_out" diff --git a/sysdeps/unix/sysv/linux/powerpc/ldd-rewrite.sed b/sysdeps/unix/sysv/linux/powerpc/ldd-rewrite.sed index 9039b69548..74bdbd9659 100644 --- a/sysdeps/unix/sysv/linux/powerpc/ldd-rewrite.sed +++ b/sysdeps/unix/sysv/linux/powerpc/ldd-rewrite.sed @@ -1,6 +1,3 @@ -/LD_TRACE_LOADED_OBJECTS=1/a\ -add_env="$add_env LD_LIBRARY_VERSION=\\$verify_out" - # ldd is generated from elf/ldd.bash.in with the name # of ld.so as generated in Makeconfig diff --git a/sysdeps/unix/sysv/linux/s390/ldd-rewrite.sed b/sysdeps/unix/sysv/linux/s390/ldd-rewrite.sed index 6b4f1bfcad..ea2b5a05cf 100644 --- a/sysdeps/unix/sysv/linux/s390/ldd-rewrite.sed +++ b/sysdeps/unix/sysv/linux/s390/ldd-rewrite.sed @@ -1,6 +1,3 @@ -/LD_TRACE_LOADED_OBJECTS=1/a\ -add_env="$add_env LD_LIBRARY_VERSION=\\$verify_out" - # ldd is generated from elf/ldd.bash.in with the name # of ld.so as generated in Makeconfig diff --git a/sysdeps/unix/sysv/linux/sparc/ldd-rewrite.sed b/sysdeps/unix/sysv/linux/sparc/ldd-rewrite.sed index 7dc2698fa8..3ec8f49f42 100644 --- a/sysdeps/unix/sysv/linux/sparc/ldd-rewrite.sed +++ b/sysdeps/unix/sysv/linux/sparc/ldd-rewrite.sed @@ -1,3 +1 @@ -/LD_TRACE_LOADED_OBJECTS=1/a\ -add_env="$add_env LD_LIBRARY_VERSION=\\$verify_out" s_^\(RTLDLIST=\)\(.*lib\)\(\|64\)\(/[^/]*\.so\.[0-9.]*\)[ ]*$_\1"\2\4 \264\4"_ diff --git a/sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed b/sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed index 44d76e8aa1..49c0c7a3a8 100644 --- a/sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed +++ b/sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed @@ -1,3 +1 @@ -/LD_TRACE_LOADED_OBJECTS=1/a\ -add_env="$add_env LD_LIBRARY_VERSION=\\$verify_out" s_^\(RTLDLIST=\)\(.*lib\)\(\|64\|x32\)\(/[^/]*\)\(-x86-64\|-x32\)\(\.so\.[0-9.]*\)[ ]*$_\1"\2\4\6 \264\4-x86-64\6 \2x32\4-x32\6"_