public inbox for passt-dev@passt.top
 help / color / mirror / code / Atom feed
From: Lukasz Gut <lgut@lgut.eu>
To: sbrivio@redhat.com
Cc: sevinj.aghayeva@gmail.com, passt-dev@passt.top,
	Lukasz Gut <lgut@lgut.eu>
Subject: [PATCH v2 2/4] mbuto: Use realpath to copy ld
Date: Wed, 18 Sep 2024 12:12:57 +0200	[thread overview]
Message-ID: <20240918101532.85299-4-lgut@lgut.eu> (raw)
In-Reply-To: <20240918101532.85299-1-lgut@lgut.eu>

Place ld in exact physical location as on host, not being confused by
links. Use realpath, that was already on the list of default PROGS.

Signed-off-by: Lukasz Gut <lgut@lgut.eu>
---
 mbuto | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/mbuto b/mbuto
index 1c3b347..1f92bd9 100755
--- a/mbuto
+++ b/mbuto
@@ -644,12 +644,13 @@ libs_path_add() {
 # libs_copy_ld_so() - Copy run-time linker program, mimic location from host
 # $1:	Path to run-time linker
 libs_copy_ld_so() {
-	[ -f "${wd}/${1}" ] && return
+	__srcfile="$("${REALPATH}" "${1}")"
+	__destfile="${wd}""${__srcfile}"
+	[ -f "${__destfile}" ] && return
 
-	__destdir="$("${DIRNAME}" "${wd}/${1}")"
+	__destdir="$("${DIRNAME}" "${__destfile}")"
 	"${MKDIR}" -p "${__destdir}"
-
-	"${CP}" --parents --preserve=all "${1}" "${wd}"
+	"${CP}" --parents --preserve=all "${__srcfile}" "${wd}"
 }
 
 # libs_dlopen_copy() - Recursively copy matching libraries from LIBS_DLOPEN
-- 
@@ -644,12 +644,13 @@ libs_path_add() {
 # libs_copy_ld_so() - Copy run-time linker program, mimic location from host
 # $1:	Path to run-time linker
 libs_copy_ld_so() {
-	[ -f "${wd}/${1}" ] && return
+	__srcfile="$("${REALPATH}" "${1}")"
+	__destfile="${wd}""${__srcfile}"
+	[ -f "${__destfile}" ] && return
 
-	__destdir="$("${DIRNAME}" "${wd}/${1}")"
+	__destdir="$("${DIRNAME}" "${__destfile}")"
 	"${MKDIR}" -p "${__destdir}"
-
-	"${CP}" --parents --preserve=all "${1}" "${wd}"
+	"${CP}" --parents --preserve=all "${__srcfile}" "${wd}"
 }
 
 # libs_dlopen_copy() - Recursively copy matching libraries from LIBS_DLOPEN
-- 
2.46.1


  parent reply	other threads:[~2024-09-18 10:17 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-09-18 10:12 [PATCH v2 0/4] mbuto: Make it work on Arch Linux Lukasz Gut
2024-09-18 10:12 ` [PATCH v2 1/4] mbuto: Pick a src when ld reported as link by ldd Lukasz Gut
2024-09-23  3:51   ` David Gibson
2024-09-23 10:09     ` Lukasz Gut
2024-09-18 10:12 ` Lukasz Gut [this message]
2024-09-23  3:53   ` [PATCH v2 2/4] mbuto: Use realpath to copy ld David Gibson
2024-09-23 10:09     ` Lukasz Gut
2024-09-18 10:12 ` [PATCH v2 3/4] mbuto: Don't try to add ld when adding libraries Lukasz Gut
2024-09-18 10:12 ` [PATCH v2 4/4] mbuto: Automatically add links related to linker Lukasz Gut
2024-09-23  3:54   ` David Gibson
2024-09-23 10:09     ` Lukasz Gut
2024-09-23  3:45 ` [PATCH v2 0/4] mbuto: Make it work on Arch Linux David Gibson
2024-09-23 10:09   ` Lukasz Gut

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240918101532.85299-4-lgut@lgut.eu \
    --to=lgut@lgut.eu \
    --cc=passt-dev@passt.top \
    --cc=sbrivio@redhat.com \
    --cc=sevinj.aghayeva@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://passt.top/passt

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for IMAP folder(s).