Subject: bug#49290: closed (Re: bug#49290: [PATCH core-updates]: Also patch shebangs in /libexec)

From: [email-masked] (GNU bug Tracking System)
Date: Wed, 07 Jul 2021 22:31:02 +0000

Your bug report

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

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
49290: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=49290
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: bug#49290: [PATCH core-updates]: Also patch shebangs in /libexec
From: Ludovic Courtès <[email-masked]>
To: Maxime Devos <[email-masked]>
Cc: [email-masked]
Date: Thu, 08 Jul 2021 00:30:16 +0200
List-Id: <debbugs-submit.debbugs.gnu.org>

Hi,

Maxime Devos <[email-masked]> skribis:

> From 64cfe798431a18675662318ca84702b33456fbef Mon Sep 17 00:00:00 2001
> From: Maxime Devos <[email-masked]>
> 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’.

Subject: [PATCH core-updates]: Also patch shebangs in /libexec
From: Maxime Devos <[email-masked]>
To: [email-masked]
Date: Wed, 30 Jun 2021 15:17:55 +0200
List-Id: <debbugs-submit.debbugs.gnu.org>

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.
From 64cfe798431a18675662318ca84702b33456fbef Mon Sep 17 00:00:00 2001
From: Maxime Devos <[email-masked]>
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