Hi, With the attached patch, sed builds on my Fedora machine. Yay! There was a small mistake in my prior email to this bug report, so you can ignore that patch.
Chris Marusich <cmmarus...@gmail.com> writes: > diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm > index 279fe9e3d8..f075ee8f74 100644 > --- a/gnu/packages/base.scm > +++ b/gnu/packages/base.scm > @@ -15,6 +15,7 @@ > ;;; Copyright © 2018 Tobias Geerinckx-Rice <m...@tobias.gr> > ;;; Copyright © 2018, 2019 Ricardo Wurmus <rek...@elephly.net> > ;;; Copyright © 2020 Vitaliy Shatrov <d0dybo0d0dy...@protonmail.com> > +;;; Copyright © 2020 Chris Marusich <cmmarus...@gmail.com> > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -141,7 +142,21 @@ including, for example, recursive directory searching.") > ".tar.gz")) > (sha256 > (base32 > - "0alqagh0nliymz23kfjg6g9w3cr086k0sfni56gi8fhzqwa3xksk")))) > + "0alqagh0nliymz23kfjg6g9w3cr086k0sfni56gi8fhzqwa3xksk")) > + ;; Remove this patch once upstream releases a fixed version. > + (patches > + (list > + (origin > + (method url-fetch) > + (uri (string-append > + "https://debbugs.gnu.org/cgi/bugreport.cgi?"; > + "att=1;msg=16;bug=36150;filename=0001-tests-" > + "Export-CONFIG_HEADER-to-test-scripts.patch")) > + (file-name > + "sed-Export-CONFIG_HEADER-to-test-scripts.patch") > + (sha256 > + (base32 > + > "0q78qzc0mv4bmsf7wnqj9fjbrwb71xz18v07h0jz2cwnbbj1nwm9"))))))) > (build-system gnu-build-system) > (synopsis "Stream editor") > (native-inputs > -- > 2.26.2 Even though this patch is appropriate for the sed maintainers, it is not appropriate for use in Guix's sed package definition. This is because the patch changes testsuite/local.mk, which is used only when creating the release distribution of sed (via an include directive in Makefile.am), and Guix builds sed from a release distribution tarball. As a result, even if Guix modifies the file, it does not have the desired effect, and the test still fails for the same reason as before. One way to work around this is to modify the Makefile.in, which is generated by Automake and included in the release distribution. I have gone ahead and committed the sed patch to core-updates in a48a3f0640d76cb5e5945557c9aae6dabce39d93. I have committed the guix lint improvement to master in 21887021b9acf60157b1b0a39c16f2ec6498021b. I am closing this bug report. -- Chris
From 24edab1ef4ecedd2d9971a96a516d800d6933201 Mon Sep 17 00:00:00 2001 From: Chris Marusich <cmmarus...@gmail.com> Date: Tue, 9 Jun 2020 23:35:56 -0700 Subject: [PATCH] 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 279fe9e3d8..2c7b4e6882 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2018 Tobias Geerinckx-Rice <m...@tobias.gr> ;;; Copyright © 2018, 2019 Ricardo Wurmus <rek...@elephly.net> ;;; Copyright © 2020 Vitaliy Shatrov <d0dybo0d0dy...@protonmail.com> +;;; Copyright © 2020 Chris Marusich <cmmarus...@gmail.com> ;;; ;;; 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
signature.asc
Description: PGP signature
