File: usrmerge-lib64.diff

package info (click to toggle)
perl 5.42.0-3
  • links: PTS, VCS
  • area: main
  • in suites: experimental
  • size: 128,392 kB
  • sloc: perl: 534,963; ansic: 240,563; sh: 72,042; pascal: 6,934; xml: 2,428; yacc: 1,360; makefile: 1,197; cpp: 208; lisp: 1
file content (28 lines) | stat: -rw-r--r-- 1,209 bytes parent folder | download | duplicates (4)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
From: Vagrant Cascadian <vagrant@reproducible-builds.org>
Date: Thu, 15 Jul 2021 20:20:07 +0000
Subject: Configure / libpth.U: Do not adjust glibpth when /usr/lib64 is
 present.

This results in differing values when built on a usrmerge system.

[Niko Tyni: Debian systems have /lib64/ld-linux-x86-64.so.2 and nothing
else, so but so called "usrmerged" systems with symlinks like /lib64 ->
/usr/lib64 would trigger the unnecessary addition of both in glibpth.]

Bug-Debian: https://bugs.debian.org/914128
---
 regen-configure/U/modified/libpth.U | 1 -
 1 file changed, 1 deletion(-)

diff --git a/regen-configure/U/modified/libpth.U b/regen-configure/U/modified/libpth.U
index 1bd69cf..f654146 100644
--- a/regen-configure/U/modified/libpth.U
+++ b/regen-configure/U/modified/libpth.U
@@ -83,7 +83,6 @@
 ?X:	/usr/shlib is for OSF/1 systems.
 ?INIT:test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth"
 ?INIT:test -f /shlib/libc.so     && glibpth="/shlib $glibpth"
-?INIT:test -d /usr/lib64         && glibpth="$glibpth /lib64 /usr/lib64 /usr/local/lib64"
 ?INIT:
 ?INIT:: Private path used by Configure to find libraries.  Its value
 ?INIT:: is prepended to libpth. This variable takes care of special