guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

04/09: gnu: fpc: Patch more dynamic-linker paths.


From: guix-commits
Subject: 04/09: gnu: fpc: Patch more dynamic-linker paths.
Date: Sat, 16 Dec 2023 12:22:43 -0500 (EST)

efraim pushed a commit to branch master
in repository guix.

commit 1954a1e33de4bb4be7f91393fd4842b37f6a4f52
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Fri Dec 15 15:34:34 2023 +0200

    gnu: fpc: Patch more dynamic-linker paths.
    
    * gnu/packages/pascal.scm (fpc)[arguments]: Patch more paths to the
    dynamic-linker in the 'configure phase.
    
    Change-Id: I0eebf1271d24e22839db0a8fd96385408067fdbf
---
 gnu/packages/pascal.scm | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/pascal.scm b/gnu/packages/pascal.scm
index 47fec7f417..c6ae1bf3dd 100644
--- a/gnu/packages/pascal.scm
+++ b/gnu/packages/pascal.scm
@@ -4,6 +4,7 @@
 ;;; Copyright © 2020 Eric Bavier <bavier@posteo.net>
 ;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;; Copyright © 2022 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2023 Efraim Flashner <efraim@flashner.co.il>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -161,9 +162,14 @@
                   (search-input-file inputs ,(glibc-dynamic-linker)))
                  (("/lib64/ld-linux-x86-64.so.2")
                   (search-input-file inputs ,(glibc-dynamic-linker)))
-                 ; TODO: /lib/ld-linux-armhf.so.3
-                 ; TODO: /lib/ld-linux-aarch64.so.1
-                 ; TODO: /lib64/ld64.so.2
+                 (("/lib/ld.so.1")
+                  (search-input-file inputs ,(glibc-dynamic-linker)))
+                 (("/lib64/ld64.so.[12]")
+                  (search-input-file inputs ,(glibc-dynamic-linker)))
+                 (("/lib/ld-linux(-armhf)?.so.3")
+                  (search-input-file inputs ,(glibc-dynamic-linker)))
+                 (("/lib/ld-linux-aarch64.so.1")
+                  (search-input-file inputs ,(glibc-dynamic-linker)))
                  ;; Add glibc to ld's search path.
                  (("if \\(isdll\\) then")
                   (string-append



reply via email to

[Prev in Thread] Current Thread [Next in Thread]