marusich pushed a commit to branch wip-ppc64le
in repository guix.
commit dce572d39ea99781683377d9345fb5c6f31522b6
Author: Chris Marusich <[email protected]>
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 b830182..55cfc0f 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -15,6 +15,7 @@
;;; Copyright © 2018 Tobias Geerinckx-Rice <[email protected]>
;;; Copyright © 2018, 2019 Ricardo Wurmus <[email protected]>
;;; Copyright © 2020 Vitaliy Shatrov <[email protected]>
+;;; Copyright © 2020 Chris Marusich <[email protected]>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -144,7 +145,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
