[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/08: gnu: gnulib: Restore shebangs.
From: |
guix-commits |
Subject: |
04/08: gnu: gnulib: Restore shebangs. |
Date: |
Fri, 17 Mar 2023 18:25:20 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 25cad456397b120f59b1779960f67423cdc00635
Author: Vivien Kraus <vivien@planete-kraus.eu>
AuthorDate: Tue Mar 14 09:58:34 2023 +0100
gnu: gnulib: Restore shebangs.
* gnu/packages/build-tools.scm (gnulib)[arguments]: Add
'restore-shebangs' phase.
[inputs, native-inputs]: Add bash-minimal.
[phase let-autogen-execute-gnulib-tool]: Specify a shell to execute
gnulib-tool from autogen.sh.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
gnu/packages/build-tools.scm | 21 +++++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm
index 28ab77bbb4..91805e1f84 100644
--- a/gnu/packages/build-tools.scm
+++ b/gnu/packages/build-tools.scm
@@ -973,12 +973,25 @@ Makefiles, JSON Compilation Database, and experimentally
Ninja.")
("NormalizationTest.txt" . "uninorm")
("auxiliary/GraphemeBreakTest.txt" . "unigbrk")
("auxiliary/WordBreakTest.txt" . "uniwbrk")))
- (delete-file "gen-uni-tables")))))))
- (inputs ;; Shebangs for some auxiliary build files.
- (list python perl clisp))
+ (delete-file "gen-uni-tables"))))
+ (add-after 'install 'restore-shebangs
+ (lambda _
+ (substitute* (find-files
+ (string-append #$output "/src/gnulib")
+ (lambda (fname stat)
+ (and (not (string-suffix?
"/lib/javaversion.class" fname))
+ (not (string-suffix? ".mo" fname)))))
+ (("^#! ?(.*)/bin/sh" _ prefix)
+ "#!/bin/sh")
+ (("^#! ?(.*)/bin/python3" _ prefix)
+ "#!/usr/bin/env python3")
+ (("^#! ?(.*)/bin/([a-zA-Z0-9-]+)" _ prefix program)
+ (string-append "#!/usr/bin/" program))))))))
+ (inputs
+ (list bash-minimal)) ;shebang for gnulib-tool
(native-inputs
(list
- python perl clisp
+ bash-minimal python perl clisp
;; Unicode data:
ucd-next
;; Programs for the tests:
- branch master updated (933051281f -> 99114eb638), guix-commits, 2023/03/17
- 01/08: services: console-font: 'stop' method always returns #f., guix-commits, 2023/03/17
- 04/08: gnu: gnulib: Restore shebangs.,
guix-commits <=
- 02/08: pack: "fakechroot" engine passes the recursive RUNPATH to ld.so., guix-commits, 2023/03/17
- 08/08: gnu: bemenu: Update to 0.6.14., guix-commits, 2023/03/17
- 06/08: home: services: Add home-xmodmap-service-type., guix-commits, 2023/03/17
- 03/08: ui: format 'display-hint' output when no arguments are passed., guix-commits, 2023/03/17
- 05/08: gnu: guile-gnutls: Do not expect gnulib shebangs to work., guix-commits, 2023/03/17
- 07/08: services: dict: Deprecate 'dicod-service' procedure., guix-commits, 2023/03/17