guix-commits
[Top][All Lists]
Advanced

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

18/18: gnu: sed: Make it build on SELinux-enabled kernels.


From: guix-commits
Subject: 18/18: gnu: sed: Make it build on SELinux-enabled kernels.
Date: Tue, 16 Mar 2021 03:23:28 -0400 (EDT)

marusich pushed a commit to branch wip-ppc64le-for-master
in repository guix.

commit 16cc8f8851ee38dfaa74ef976b0609a837ba682d
Author: Chris Marusich <cmmarusich@gmail.com>
AuthorDate: Tue Jun 9 23:35:56 2020 -0700

    gnu: sed: Make it build on SELinux-enabled kernels.
    
    Fixes: <https://bugs.gnu.org/41498>.
    
    * gnu/packages/base.scm (sed)[arguments]: New field.  This adds a
    snippet, equivalent to the patch submitted upstream, which fixes an
    issue that prevents sed from building on SELinux-enabled kernels.
    
    Adjusted by Efraim Flashner to apply to master.
---
 gnu/packages/base.scm | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 7c5ac61..f0f9353 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -148,6 +148,22 @@ including, for example, recursive directory searching.")
              (base32
               "0alqagh0nliymz23kfjg6g9w3cr086k0sfni56gi8fhzqwa3xksk"))))
    (build-system gnu-build-system)
+   (arguments
+    ;; TODO: When merging this into core-updates, keep the version of
+    ;; this code (with comment!) applied as a snippet.
+    `(,@(if (string-prefix? "powerpc64le" (or (%current-target-system)
+                                              (%current-system)))
+          `(#:phases
+            (modify-phases %standard-phases
+              (add-after 'unpack 'allow-building-on-selinux-systems
+                (lambda _
+                  (substitute* "Makefile.in"
+                    (("^  abs_srcdir='\\$\\(abs_srcdir\\)'.*" previous-line)
+                     (string-append
+                      previous-line
+                      "  CONFIG_HEADER='$(CONFIG_HEADER)'\t\t\\\n")))
+                  #t))))
+          '())))
    (synopsis "Stream editor")
    (native-inputs
     `(("perl" ,perl)))                            ;for tests



reply via email to

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