guix-commits
[Top][All Lists]
Advanced

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

branch core-updates updated: gnu: sed: Make it build on SELinux-enabled


From: guix-commits
Subject: branch core-updates updated: gnu: sed: Make it build on SELinux-enabled kernels.
Date: Fri, 12 Jun 2020 01:39:08 -0400

This is an automated email from the git hooks/post-receive script.

marusich pushed a commit to branch core-updates
in repository guix.

The following commit(s) were added to refs/heads/core-updates by this push:
     new a48a3f0  gnu: sed: Make it build on SELinux-enabled kernels.
a48a3f0 is described below

commit a48a3f0640d76cb5e5945557c9aae6dabce39d93
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)[origin][snippet]: 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.
---
 gnu/packages/base.scm | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 325d2e2..ecea6c9 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -15,6 +15,7 @@
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2020 Vitaliy Shatrov <D0dyBo0D0dyBo0@protonmail.com>
+;;; Copyright © 2020 Chris Marusich <cmmarusich@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -142,7 +143,19 @@ including, for example, recursive directory searching.")
                                 ".tar.gz"))
             (sha256
              (base32
-              "0alqagh0nliymz23kfjg6g9w3cr086k0sfni56gi8fhzqwa3xksk"))))
+              "0alqagh0nliymz23kfjg6g9w3cr086k0sfni56gi8fhzqwa3xksk"))
+            ;; Remove this snippet once upstream releases a fixed version.
+            ;; This snippet changes Makefile.in, even though the upstream
+            ;; patch changes testsuite/local.mk, since we build sed from a
+            ;; release tarball.  See: https://bugs.gnu.org/36150
+            (snippet
+             '(begin
+                (substitute* "Makefile.in"
+                  (("^  abs_srcdir='\\$\\(abs_srcdir\\)'.*" previous-line)
+                   (string-append
+                    previous-line
+                    "  CONFIG_HEADER='$(CONFIG_HEADER)'\t\t\\\n")))))
+            (modules '((guix build utils)))))
    (build-system gnu-build-system)
    (synopsis "Stream editor")
    (native-inputs



reply via email to

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