From 24edab1ef4ecedd2d9971a96a516d800d6933201 Mon Sep 17 00:00:00 2001 From: Chris Marusich Date: Tue, 9 Jun 2020 23:35:56 -0700 Subject: [PATCH] gnu: sed: Make it build on SELinux-enabled kernels. Fixes: . * 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 279fe9e3d8..2c7b4e6882 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2019 Ricardo Wurmus ;;; Copyright © 2020 Vitaliy Shatrov +;;; Copyright © 2020 Chris Marusich ;;; ;;; This file is part of GNU Guix. ;;; @@ -141,7 +142,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 -- 2.26.2