From patchwork Tue Mar 16 06:45:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Marusich X-Patchwork-Id: 27881 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8FD0827BC54; Tue, 16 Mar 2021 06:49:59 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 02A2827BC52 for ; Tue, 16 Mar 2021 06:49:59 +0000 (GMT) Received: from localhost ([::1]:59638 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lM3Wg-0005Fz-6Y for patchwork@mira.cbaines.net; Tue, 16 Mar 2021 02:49:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49602) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lM3Uu-0003GG-Fb for guix-patches@gnu.org; Tue, 16 Mar 2021 02:48:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54632) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lM3Uu-0005c0-6E for guix-patches@gnu.org; Tue, 16 Mar 2021 02:48:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lM3Uu-0001gn-4p for guix-patches@gnu.org; Tue, 16 Mar 2021 02:48:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47182] [PATCH 18/18] gnu: sed: Make it build on SELinux-enabled kernels. Resent-From: Chris Marusich Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 16 Mar 2021 06:48:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47182 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47182@debbugs.gnu.org Cc: Chris Marusich Received: via spool by 47182-submit@debbugs.gnu.org id=B47182.16158772476335 (code B ref 47182); Tue, 16 Mar 2021 06:48:08 +0000 Received: (at 47182) by debbugs.gnu.org; 16 Mar 2021 06:47:27 +0000 Received: from localhost ([127.0.0.1]:37930 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lM3UF-0001e2-Er for submit@debbugs.gnu.org; Tue, 16 Mar 2021 02:47:27 -0400 Received: from mail-pg1-f169.google.com ([209.85.215.169]:43580) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lM3U1-0001bJ-8p for 47182@debbugs.gnu.org; Tue, 16 Mar 2021 02:47:13 -0400 Received: by mail-pg1-f169.google.com with SMTP id n10so21966938pgl.10 for <47182@debbugs.gnu.org>; Mon, 15 Mar 2021 23:47:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uBIQVZI2jrbcjIl6qmJMJm7AHQfJWiPonNfGzXy8W0Y=; b=qNEAzEdHOPwya5d/tbKvkXG6Rpuh0Tio/WZaS/zvtLyKbQtl2bUlUVTWCHsFTDSuhb sH/k9MczpkTs0L001BURrv+wCe+PEPANfkgNM/l+29G0KeXdQAQrZRTXE98P7rUMKsa5 s1s2g8pHCZA64+KbqOfBTFO3EN+Q79aJK6KNNWkWVkbuwvs2z1sGzlOy7GaPiOOmk9f9 l1n/JkBT/IYafdmxWv9185G7YGdBaIufI5Gt9xhvrFLnUxvQRajR+x7DrEVH62ZNGdhz +K6Jl+D6ekuxbyR2iJdzJSI3mgXKM43zwqJYGDig05mphcSOLLN+1yXU0ObqAzI+semh cxug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uBIQVZI2jrbcjIl6qmJMJm7AHQfJWiPonNfGzXy8W0Y=; b=Yi2RglcyUKFyCtt9qhob03yKfTIZpqAO2iLBjETH/sU9D4/41EZd0LiVxDoJyxXcFw hWJUoil9zNCkCCVHJASpVtc2klKQfPT3RAWXjKmEaYRbBMbrEDa+ufgXBvoqY2stKPNe Tk9EiWuLgOjNBhlllALbDs8ifIBUUicNINIMQIvq7VB0HhD7JebVb58glz66J8TRBal5 VpYSCyV4rJNjwWiquMTzAk7GbhA/KYoaO2XEqEdvtSJwP8howhnxgUSG/xLD5KrQwz2d PRSqzlerCfeLdvpsC+/SmO/iHQyGmc09ajRMqJd3qsq8QvDTHw19AZB0FUrfuz26SwkC 8PPg== X-Gm-Message-State: AOAM532/eRdt/np4B3lnmXKLNmPzvnuIPE5/eUyke5N0B42sk1ZAhoFG MqGNQxPGaJml91XttJrTuAbOD6anAsqIdw== X-Google-Smtp-Source: ABdhPJxNy8N6OMwMX6FBiof1bCl+0Xyug9EFApOjyRnUCZQVw/oQD6K/PppUSQ4fdmqUqkYPeFkbDg== X-Received: by 2002:a63:224c:: with SMTP id t12mr2562903pgm.289.1615877227261; Mon, 15 Mar 2021 23:47:07 -0700 (PDT) Received: from garuda-lan.lan (c-24-18-44-142.hsd1.wa.comcast.net. [24.18.44.142]) by smtp.gmail.com with ESMTPSA id r186sm15541160pfr.124.2021.03.15.23.47.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Mar 2021 23:47:06 -0700 (PDT) From: Chris Marusich Date: Mon, 15 Mar 2021 23:45:11 -0700 Message-Id: <20210316064511.2891553-18-cmmarusich@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210316064511.2891553-1-cmmarusich@gmail.com> References: <20210316062805.2890883-1-cmmarusich@gmail.com> <20210316064511.2891553-1-cmmarusich@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Fixes: . * 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 7c5ac61f01c..f0f93533986 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