[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/25: gnu: libtool: Don't reference bash by label.
From: |
guix-commits |
Subject: |
06/25: gnu: libtool: Don't reference bash by label. |
Date: |
Sat, 23 Jul 2022 13:44:48 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit c84fa7a253b3405f8f29e79ac65546eea2562641
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Sun Jul 17 00:12:35 2022 +0200
gnu: libtool: Don't reference bash by label.
* gnu/packages/autotools.scm (libtool)[arguments]: Use SEARCH-INPUT-FILE
instead of label.
---
gnu/packages/autotools.scm | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm
index c702be43fa..0357af8850 100644
--- a/gnu/packages/autotools.scm
+++ b/gnu/packages/autotools.scm
@@ -475,10 +475,9 @@ Makefile, simplifying the entire process for the
developer.")
(number->string (parallel-job-count))
"1")))
;; Patch references to /bin/sh.
- (let ((bash (assoc-ref (or native-inputs inputs) "bash")))
+ (let ((/bin/sh (search-input-file (or native-inputs inputs)
"bin/sh")))
(substitute* "tests/testsuite"
- (("/bin/sh")
- (string-append bash "/bin/sh"))))))
+ (("/bin/sh") /bin/sh)))))
;; These files may be copied into source trees by libtoolize,
;; therefore they must not point to store file names that would be
;; leaked with tarballs generated by make dist.
- branch core-updates updated (5d970dfa89 -> c4386d0603), guix-commits, 2022/07/23
- 01/25: gnu: SQLite: Update to 3.39.1., guix-commits, 2022/07/23
- 05/25: gnu: make-autoconf-wrapper: Remove input labels., guix-commits, 2022/07/23
- 06/25: gnu: libtool: Don't reference bash by label.,
guix-commits <=
- 08/25: gnu: GnuPG: Update to 2.2.36., guix-commits, 2022/07/23
- 09/25: gnu: GnuPG: Use G-expression., guix-commits, 2022/07/23
- 07/25: gnu: libpaper: Update to 1.2.2., guix-commits, 2022/07/23
- 20/25: gnu: gpgme: Update to 1.17.1., guix-commits, 2022/07/23
- 11/25: gnu: cyrus-sasl: Fix indentation., guix-commits, 2022/07/23
- 03/25: gnu: automake: Remove input labels., guix-commits, 2022/07/23
- 02/25: gnu: automake: Update to 1.16.5., guix-commits, 2022/07/23
- 04/25: gnu: autoconf: Remove input labels., guix-commits, 2022/07/23
- 17/25: gnu: source-highlight: Fix build with newer GCC., guix-commits, 2022/07/23
- 18/25: gnu: gdk-pixbuf: Update to 2.42.8., guix-commits, 2022/07/23