[bug#49290] [PATCH core-updates]: Also patch shebangs in /libexec

[bug#49290] [PATCH core-updates]: Also patch shebangs in /libexec

[Maxime Devos]

[-- Attachment #1.1: Type: text/plain, Size: 197 bytes --]

Currently untested, I'm mostly claiming a bug id to refer to
in some other commit message for now.  This is important
for cross-compiling "isc-dhcp" though some other fixes are
also necessary.

[-- Attachment #1.2: 0001-gnu-build-system-patch-shebangs-Also-patch-shebangs-.patch --]
[-- Type: text/x-patch, Size: 1223 bytes --]

From 64cfe798431a18675662318ca84702b33456fbef Mon Sep 17 00:00:00 2001
From: Maxime Devos <maximedevos@telenet.be>
Date: Wed, 30 Jun 2021 15:10:28 +0200
Subject: [PATCH] gnu-build-system: patch-shebangs: Also patch shebangs in
 "/libexec".

Shebangs in "/bin" and "/sbin" subdirectories are currently
patched by patch-shebangs. But shebangs in "/libexec" currently
aren't, even though they occasionally need to be. E.g. when using
wrap-program on an executable in "libexec" without an explicit #:sh
when cross-compiling.

* guix/build/gnu-build-system.scm (patch-shebangs):
  Add "/libexec" to 'bin-directories'.
---
 guix/build/gnu-build-system.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/guix/build/gnu-build-system.scm b/guix/build/gnu-build-system.scm
index 28c719d9ca..d0f7413268 100644
--- a/guix/build/gnu-build-system.scm
+++ b/guix/build/gnu-build-system.scm
@@ -407,7 +407,8 @@ makefiles."
     (match-lambda
      ((_ . dir)
       (list (string-append dir "/bin")
-            (string-append dir "/sbin")))))
+            (string-append dir "/sbin")
+            (string-append dir "/libexec")))))
 
   (define output-bindirs
     (append-map bin-directories outputs))
-- 
2.32.0


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

bug#49290: [PATCH core-updates]: Also patch shebangs in /libexec

[Ludovic Courtès]

Hi,

Maxime Devos <maximedevos@telenet.be> skribis:

> From 64cfe798431a18675662318ca84702b33456fbef Mon Sep 17 00:00:00 2001
> From: Maxime Devos <maximedevos@telenet.be>
> Date: Wed, 30 Jun 2021 15:10:28 +0200
> Subject: [PATCH] gnu-build-system: patch-shebangs: Also patch shebangs in
>  "/libexec".
>
> Shebangs in "/bin" and "/sbin" subdirectories are currently
> patched by patch-shebangs. But shebangs in "/libexec" currently
> aren't, even though they occasionally need to be. E.g. when using
> wrap-program on an executable in "libexec" without an explicit #:sh
> when cross-compiling.
>
> * guix/build/gnu-build-system.scm (patch-shebangs):
>   Add "/libexec" to 'bin-directories'.

Pushed as 198df037562e7b4e0e90783dc5cba1e1c32f2110, thanks!

Ludo’.