From patchwork Sun Sep 13 05:45:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 24105 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 9C43F27BBE8; Sun, 13 Sep 2020 06:47:16 +0100 (BST) 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_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,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 70DD027BBE7 for ; Sun, 13 Sep 2020 06:47:16 +0100 (BST) Received: from localhost ([::1]:35778 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kHKr5-0004QM-Gs for patchwork@mira.cbaines.net; Sun, 13 Sep 2020 01:47:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58412) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kHKqs-0004Pn-I8 for guix-patches@gnu.org; Sun, 13 Sep 2020 01:47:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:37802) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kHKqs-00027U-9F for guix-patches@gnu.org; Sun, 13 Sep 2020 01:47:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kHKqs-0000vp-69 for guix-patches@gnu.org; Sun, 13 Sep 2020 01:47:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43367] [PATCH 1/5] utils: wrap-program: Refuse to wrap .X-real files. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 13 Sep 2020 05:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43367 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43367@debbugs.gnu.org Received: via spool by 43367-submit@debbugs.gnu.org id=B43367.15999759843485 (code B ref 43367); Sun, 13 Sep 2020 05:47:02 +0000 Received: (at 43367) by debbugs.gnu.org; 13 Sep 2020 05:46:24 +0000 Received: from localhost ([127.0.0.1]:49336 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kHKqG-0000u9-5z for submit@debbugs.gnu.org; Sun, 13 Sep 2020 01:46:24 -0400 Received: from mout-p-102.mailbox.org ([80.241.56.152]:50636) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kHKqF-0000ts-0Y for 43367@debbugs.gnu.org; Sun, 13 Sep 2020 01:46:23 -0400 Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:105:465:1:2:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-102.mailbox.org (Postfix) with ESMTPS id 4Bpz4m6Tr2zKmV1 for <43367@debbugs.gnu.org>; Sun, 13 Sep 2020 07:46:16 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1599975975; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FSlbc1KMo1TRSTALdnQ1FHgRvX/spQIlHUx6WcN6IYk=; b=kOovU+aZdX//4Vk1Pw3vzi1l2PRsTnRO3arVDVg7Xj+pOsPeJ1kT5ELreqgBHajjM2ybwD /f3tCbhAzCZKDu6HdJ0NVEcTeir1/SrC7P/CD+XUiHHRYzBuoKaQ21XUn+43YnB1FZhtJD nIOuTtqt8uuqO9kyoyPpLpJexZQrp65QJQcbO3k3ohk/hcYCQu0PgeoWoMpaFIKe5uAR7U /+nyBZ2Od7d/CDDr7m9Z9czLGIKWPJX2Rrm+L07/e82b9KqLf/62NJc8iX7xUS1A0OZiuf lxzLfNLNFTldt38JJR99h006D1pmf67QMTTRZFT1fr88qqbhE6x26g4+5VLLug== Received: from smtp2.mailbox.org ([80.241.60.241]) by hefe.heinlein-support.de (hefe.heinlein-support.de [91.198.250.172]) (amavisd-new, port 10030) with ESMTP id OD_Vp6VVa-P1 for <43367@debbugs.gnu.org>; Sun, 13 Sep 2020 07:46:13 +0200 (CEST) From: Brendan Tildesley Date: Sun, 13 Sep 2020 15:45:53 +1000 Message-Id: <20200913054557.12911-1-mail@brendan.scot> In-Reply-To: <83311dc4-6e9b-e70b-e379-9993bfcd0554@brendan.scot> References: <83311dc4-6e9b-e70b-e379-9993bfcd0554@brendan.scot> MIME-Version: 1.0 X-MBO-SPAM-Probability: * X-Rspamd-Score: 1.48 / 15.00 / 15.00 X-Rspamd-Queue-Id: D85C0271 X-Rspamd-UID: 9d3abe 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 * guix/build/utils.scm: (wrap-program): Error if wrap-program was mistakenly passed a .X-real file. This prevents and forces us to fix cases where a double wrapped ..X-real-real file is created, such as can be seen with: find /gnu/ -iname '.*-real-real' --- guix/build/utils.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/guix/build/utils.scm b/guix/build/utils.scm index e872cfffd3..822191f4de 100644 --- a/guix/build/utils.scm +++ b/guix/build/utils.scm @@ -1194,6 +1194,9 @@ with definitions for VARS." (format #f "export ~a=\"$~a${~a:+:}~a\"" var var var (string-join rest ":"))))) + (when (wrapped-program? prog) + (error (string-append prog " is a wrapper. Refusing to wrap."))) + (if already-wrapped? ;; PROG is already a wrapper: add the new "export VAR=VALUE" lines just From patchwork Sun Sep 13 05:45:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 24108 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 44F9727BBE7; Sun, 13 Sep 2020 06:47:18 +0100 (BST) 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_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,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 E3CC627BBE8 for ; Sun, 13 Sep 2020 06:47:17 +0100 (BST) Received: from localhost ([::1]:35830 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kHKr7-0004Ro-1O for patchwork@mira.cbaines.net; Sun, 13 Sep 2020 01:47:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58418) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kHKqs-0004Pu-Si for guix-patches@gnu.org; Sun, 13 Sep 2020 01:47:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:37803) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kHKqs-00027Y-KJ for guix-patches@gnu.org; Sun, 13 Sep 2020 01:47:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kHKqs-0000vw-Ig for guix-patches@gnu.org; Sun, 13 Sep 2020 01:47:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43367] [PATCH 2/5] utils: Rename wrapper? to wrapped-program?. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 13 Sep 2020 05:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43367 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43367@debbugs.gnu.org Received: via spool by 43367-submit@debbugs.gnu.org id=B43367.15999759873506 (code B ref 43367); Sun, 13 Sep 2020 05:47:02 +0000 Received: (at 43367) by debbugs.gnu.org; 13 Sep 2020 05:46:27 +0000 Received: from localhost ([127.0.0.1]:49340 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kHKqJ-0000uT-Fm for submit@debbugs.gnu.org; Sun, 13 Sep 2020 01:46:27 -0400 Received: from mout-p-202.mailbox.org ([80.241.56.172]:50346) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kHKqG-0000tw-Sc for 43367@debbugs.gnu.org; Sun, 13 Sep 2020 01:46:25 -0400 Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:105:465:1:2:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4Bpz4p5cWPzQkmG for <43367@debbugs.gnu.org>; Sun, 13 Sep 2020 07:46:18 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1599975976; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=z2gxQwUEosdiIO6kGilY/BWyNTtagfYFScxJn3j9RLI=; b=ej51wAzD3S9Y6lmXVEAlZuO1ky4K4Gqvw54vvoLTAyRYbq4I9XL25CBlp9iIGCqCA/dmjv tDEcNncMwdCGT+9HsEX0Hvcy1DU+gOVoQhLYBtjbwWF1NTDobVnfXhzFMmaDfhdXkEagth O9NcWvHf5kN5S9ZXBtQIqReYBkfZva3CUO5pYiSjIem3fIeDkKzR7x1m5268RuDUxuqQgp rDCVWsEqQYy5CQkOfTFo4AoPd+qcfhiSOe1S6aIMdJiDY4ExDRDOsKavNyB+MSu81ZnqxU BbY3+4CIJeGbLbrgyXkeo66cKAtp0VeDe9WdsIEVyS+O54UypIqa3v5mtm+izQ== Received: from smtp2.mailbox.org ([80.241.60.241]) by gerste.heinlein-support.de (gerste.heinlein-support.de [91.198.250.173]) (amavisd-new, port 10030) with ESMTP id LJcBWiW7319K for <43367@debbugs.gnu.org>; Sun, 13 Sep 2020 07:46:15 +0200 (CEST) From: Brendan Tildesley Date: Sun, 13 Sep 2020 15:45:54 +1000 Message-Id: <20200913054557.12911-2-mail@brendan.scot> In-Reply-To: <20200913054557.12911-1-mail@brendan.scot> References: <83311dc4-6e9b-e70b-e379-9993bfcd0554@brendan.scot> <20200913054557.12911-1-mail@brendan.scot> MIME-Version: 1.0 X-MBO-SPAM-Probability: * X-Rspamd-Score: 0.80 / 15.00 / 15.00 X-Rspamd-Queue-Id: CC504273 X-Rspamd-UID: 42e5da 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 * guix/build/utils.scm (wrap-program): The wrapper? procedure is incorrectly named as it actually checks to see if prog is the original program that was moved, not the wrapper. * guix/build/python-build-system: (wrap): Use renamed wrapped-program?. --- guix/build/python-build-system.scm | 2 +- guix/build/utils.scm | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/guix/build/python-build-system.scm b/guix/build/python-build-system.scm index 62e7a7b305..d1dbbc1de2 100644 --- a/guix/build/python-build-system.scm +++ b/guix/build/python-build-system.scm @@ -196,7 +196,7 @@ when running checks after installing the package." (define (list-of-files dir) (find-files dir (lambda (file stat) (and (eq? 'regular (stat:type stat)) - (not (wrapper? file)))))) + (not (wrapped-program? file)))))) (define bindirs (append-map (match-lambda diff --git a/guix/build/utils.scm b/guix/build/utils.scm index 822191f4de..4cd227a668 100644 --- a/guix/build/utils.scm +++ b/guix/build/utils.scm @@ -90,7 +90,7 @@ patch-/usr/bin/file fold-port-matches remove-store-references - wrapper? + wrapped-program? wrap-program wrap-script @@ -1118,8 +1118,8 @@ known as `nuke-refs' in Nixpkgs." (program wrap-error-program) (type wrap-error-type)) -(define (wrapper? prog) - "Return #t if PROG is a wrapper as produced by 'wrap-program'." +(define (wrapped-program? prog) + "Return #t if PROG is a program that was moved and wrapped by 'wrap-program'." (and (file-exists? prog) (let ((base (basename prog))) (and (string-prefix? "." base) From patchwork Sun Sep 13 05:45:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 24106 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 AC7A127BBE8; Sun, 13 Sep 2020 06:47:17 +0100 (BST) 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_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,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 5891C27BBE7 for ; Sun, 13 Sep 2020 06:47:17 +0100 (BST) Received: from localhost ([::1]:35806 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kHKr6-0004RD-Ga for patchwork@mira.cbaines.net; Sun, 13 Sep 2020 01:47:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58422) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kHKqt-0004Q2-Da for guix-patches@gnu.org; Sun, 13 Sep 2020 01:47:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:37804) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kHKqt-00027c-0p for guix-patches@gnu.org; Sun, 13 Sep 2020 01:47:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kHKqs-0000w4-VS for guix-patches@gnu.org; Sun, 13 Sep 2020 01:47:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43367] [PATCH 3/5] glib-or-gtk-build-system: Don't double wrap programs. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 13 Sep 2020 05:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43367 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43367@debbugs.gnu.org Received: via spool by 43367-submit@debbugs.gnu.org id=B43367.15999759883518 (code B ref 43367); Sun, 13 Sep 2020 05:47:02 +0000 Received: (at 43367) by debbugs.gnu.org; 13 Sep 2020 05:46:28 +0000 Received: from localhost ([127.0.0.1]:49343 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kHKqJ-0000uW-Q5 for submit@debbugs.gnu.org; Sun, 13 Sep 2020 01:46:28 -0400 Received: from mout-p-201.mailbox.org ([80.241.56.171]:31064) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kHKqI-0000ty-EN for 43367@debbugs.gnu.org; Sun, 13 Sep 2020 01:46:26 -0400 Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:105:465:1:2:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 4Bpz4r2WVCzQkkJ for <43367@debbugs.gnu.org>; Sun, 13 Sep 2020 07:46:20 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1599975978; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GDXmgOMbs3D4zP72xGN8NM0+tHTbLwgy8rtz/dY09vc=; b=Q3wAc9i6clSohE6FlxhTwVtb5fhf1WjqlYPWrbSVWIQROUV0Ml+HilP/NSJKkAqPClpuuX yMfjhxQZFbqI/4tWNQOQtRQ95a+fmnb0tJlde25Ah6Y2gcVoMOR5CAu11ijTWR8KMh1iif R4S0XeIVOAj+GUhzkduqhFSx9t2slSgL0R5MWla+jBjzhGsL1jlyVr5NHPHpXlMHzu/jBS OpiCk4LxjHZiKGY7QMGdH2HIj9L1lU0EFjzNCKIOLiCdUiaiFTLj3XyQRkg8CxWzceksmE KciWrR9MflDrbNvZOjtvSDG3RJwrljevigkrPF/Mhy2595VQji0EGueN9TlpNQ== Received: from smtp2.mailbox.org ([80.241.60.241]) by spamfilter04.heinlein-hosting.de (spamfilter04.heinlein-hosting.de [80.241.56.122]) (amavisd-new, port 10030) with ESMTP id SavwKnaseiS0 for <43367@debbugs.gnu.org>; Sun, 13 Sep 2020 07:46:17 +0200 (CEST) From: Brendan Tildesley Date: Sun, 13 Sep 2020 15:45:55 +1000 Message-Id: <20200913054557.12911-3-mail@brendan.scot> In-Reply-To: <20200913054557.12911-1-mail@brendan.scot> References: <83311dc4-6e9b-e70b-e379-9993bfcd0554@brendan.scot> <20200913054557.12911-1-mail@brendan.scot> MIME-Version: 1.0 X-MBO-SPAM-Probability: * X-Rspamd-Score: 0.53 / 15.00 / 15.00 X-Rspamd-Queue-Id: 631E8271 X-Rspamd-UID: 6ce4ee 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 * guix/build/glib-or-gtk-build-system.scm (wrap-all-programs): If a package definition was modified to insert an additional wrap phase before glib-or-gtk...'s wrap phase instead of after, glib-or-gtk...'s wrap phase will double wrap the .X-real file from the earlier wrap phase. Filtering out such wrapped programs means these .X-real files should fix this and mean packagers don't have to worry about ensuring their wrap phases are put afterwards. --- guix/build/glib-or-gtk-build-system.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/guix/build/glib-or-gtk-build-system.scm b/guix/build/glib-or-gtk-build-system.scm index ba680fd1a9..ccb3138fe2 100644 --- a/guix/build/glib-or-gtk-build-system.scm +++ b/guix/build/glib-or-gtk-build-system.scm @@ -142,8 +142,9 @@ add a dependency of that output on GLib and GTK+." (unless (member output glib-or-gtk-wrap-excluded-outputs) (let* ((bindir (string-append directory "/bin")) (libexecdir (string-append directory "/libexec")) - (bin-list (append (find-files bindir ".*") - (find-files libexecdir ".*"))) + (bin-list (filter (negate wrapped-program?) + (append (find-files bindir ".*") + (find-files libexecdir ".*")))) (datadirs (data-directories (alist-cons output directory inputs))) (gtk-mod-dirs (gtk-module-directories From patchwork Sun Sep 13 05:45:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 24107 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 1A94B27BBE9; Sun, 13 Sep 2020 06:47:18 +0100 (BST) 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_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,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 CA1E727BBE7 for ; Sun, 13 Sep 2020 06:47:17 +0100 (BST) Received: from localhost ([::1]:35814 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kHKr6-0004Rc-V4 for patchwork@mira.cbaines.net; Sun, 13 Sep 2020 01:47:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58424) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kHKqt-0004Q3-OL for guix-patches@gnu.org; Sun, 13 Sep 2020 01:47:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:37805) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kHKqt-00027h-DW for guix-patches@gnu.org; Sun, 13 Sep 2020 01:47:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kHKqt-0000wB-Bx for guix-patches@gnu.org; Sun, 13 Sep 2020 01:47:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43367] [PATCH 4/5] rakudo-build-system: Don't double wrap programs. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 13 Sep 2020 05:47:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43367 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43367@debbugs.gnu.org Received: via spool by 43367-submit@debbugs.gnu.org id=B43367.15999759923535 (code B ref 43367); Sun, 13 Sep 2020 05:47:03 +0000 Received: (at 43367) by debbugs.gnu.org; 13 Sep 2020 05:46:32 +0000 Received: from localhost ([127.0.0.1]:49346 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kHKqO-0000uw-3H for submit@debbugs.gnu.org; Sun, 13 Sep 2020 01:46:32 -0400 Received: from mout-p-101.mailbox.org ([80.241.56.151]:64818) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kHKqJ-0000u0-HV for 43367@debbugs.gnu.org; Sun, 13 Sep 2020 01:46:27 -0400 Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:105:465:1:2:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4Bpz4s4XxhzKmc3 for <43367@debbugs.gnu.org>; Sun, 13 Sep 2020 07:46:21 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1599975979; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ur2jpyG4b+NO01Y6UbYtAKyVgRPbQrk9jUkfdt5VRyA=; b=dgQT1JIrK3d47hACEwzTZwbHDYTUkRdiM0Rnamz9w8rVAvHwAYc6yau/uZ1OVTHVQfzP/C T5IdA2I46qbplD1vlZwkFQwql/uFt6ofxnYIYZoUh5imub4byaRLbi9xple9zgSNq5kTaC dGid1t4hB/KAZink6hVPOFKmp4P0NCg1RbW5Cnute6BhWjPih4zlGHkxuWjhciIJdeIFkc LlXBVDrSIrqbrdFxSVIrPbHT8YU2CqOQGxKLpUvuDp0V8e1aVCxW+GkVuTMY5c1WCcKzHh CZDbnadKsZfSlju1BqtEm+lKU8BQyLXYYIroP+G/6CoLjmB9ypV5W1XaqmcyEA== Received: from smtp2.mailbox.org ([80.241.60.241]) by spamfilter02.heinlein-hosting.de (spamfilter02.heinlein-hosting.de [80.241.56.116]) (amavisd-new, port 10030) with ESMTP id c5Ix7i6P-ZDh for <43367@debbugs.gnu.org>; Sun, 13 Sep 2020 07:46:19 +0200 (CEST) From: Brendan Tildesley Date: Sun, 13 Sep 2020 15:45:56 +1000 Message-Id: <20200913054557.12911-4-mail@brendan.scot> In-Reply-To: <20200913054557.12911-1-mail@brendan.scot> References: <83311dc4-6e9b-e70b-e379-9993bfcd0554@brendan.scot> <20200913054557.12911-1-mail@brendan.scot> MIME-Version: 1.0 X-MBO-SPAM-Probability: * X-Rspamd-Score: 0.15 / 15.00 / 15.00 X-Rspamd-Queue-Id: 9F05326E X-Rspamd-UID: 6cc3e5 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 * guix/build/rakudo-build-system.scm (wrap): Don't return any potential already wrapped-programs in the list-of-files to wrap. --- guix/build/rakudo-build-system.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/guix/build/rakudo-build-system.scm b/guix/build/rakudo-build-system.scm index dbdeb1ccd2..b2c090f946 100644 --- a/guix/build/rakudo-build-system.scm +++ b/guix/build/rakudo-build-system.scm @@ -97,7 +97,8 @@ (map (cut string-append dir "/" <>) (or (scandir dir (lambda (f) (let ((s (stat (string-append dir "/" f)))) - (eq? 'regular (stat:type s))))) + (and (eq? 'regular (stat:type s)) + (not (wrapped-program? f)))))) '()))) (define bindirs From patchwork Sun Sep 13 05:45:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 24109 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 6143127BBE8; Sun, 13 Sep 2020 06:47:25 +0100 (BST) 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_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,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 3254E27BBE7 for ; Sun, 13 Sep 2020 06:47:25 +0100 (BST) Received: from localhost ([::1]:36614 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kHKrE-0004no-EF for patchwork@mira.cbaines.net; Sun, 13 Sep 2020 01:47:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58428) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kHKqu-0004Q5-1d for guix-patches@gnu.org; Sun, 13 Sep 2020 01:47:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:37806) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kHKqt-00027o-Pm for guix-patches@gnu.org; Sun, 13 Sep 2020 01:47:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kHKqt-0000wJ-Ob for guix-patches@gnu.org; Sun, 13 Sep 2020 01:47:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43367] [PATCH 5/5] qt-build-system: Don't double wrap programs. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 13 Sep 2020 05:47:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43367 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43367@debbugs.gnu.org Received: via spool by 43367-submit@debbugs.gnu.org id=B43367.15999759923542 (code B ref 43367); Sun, 13 Sep 2020 05:47:03 +0000 Received: (at 43367) by debbugs.gnu.org; 13 Sep 2020 05:46:32 +0000 Received: from localhost ([127.0.0.1]:49348 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kHKqO-0000uy-A9 for submit@debbugs.gnu.org; Sun, 13 Sep 2020 01:46:32 -0400 Received: from mout-p-102.mailbox.org ([80.241.56.152]:50640) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kHKqL-0000u8-7t for 43367@debbugs.gnu.org; Sun, 13 Sep 2020 01:46:29 -0400 Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:105:465:1:2:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-102.mailbox.org (Postfix) with ESMTPS id 4Bpz4v5mN1zKmV1 for <43367@debbugs.gnu.org>; Sun, 13 Sep 2020 07:46:23 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1599975982; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qORu6FXXehCXwr9WEUG2YpCClc1TBn/W+Bm2zKyYZwo=; b=X6FKTJmscx+ZLs7NaKn1DUo7GVKe6xgCcrydCbASkaqpMTozWk5kxUUL32UAJbUG9OZrj+ Y5xY05TD8Ip/ju3XExXh8FyyLQAah5zabvo4WUgTlH558Uw64Cl6Zfvl1jZIlA/jp3vWY1 R5Yn7iK23yNrdjs9w3S83lZFwSJa083zGwjZ/h/GqO2SVXwp39KRNFJ05TcHb/BJ45kFdp 016MnGB/1MfxfDfEUUIzW04OdGC0lEmvHnpws7cLhmP+qXaMi9kvXpn5P8kvo/QEfJZTie Mb05NxcsAJGuUNR2gLWQWCAkh3dpnzR+1l5OCuRbdvE8qPtIXiwAZfnlerTTcA== Received: from smtp2.mailbox.org ([80.241.60.241]) by spamfilter04.heinlein-hosting.de (spamfilter04.heinlein-hosting.de [80.241.56.122]) (amavisd-new, port 10030) with ESMTP id S3JG-BPHjXm3 for <43367@debbugs.gnu.org>; Sun, 13 Sep 2020 07:46:20 +0200 (CEST) From: Brendan Tildesley Date: Sun, 13 Sep 2020 15:45:57 +1000 Message-Id: <20200913054557.12911-5-mail@brendan.scot> In-Reply-To: <20200913054557.12911-1-mail@brendan.scot> References: <83311dc4-6e9b-e70b-e379-9993bfcd0554@brendan.scot> <20200913054557.12911-1-mail@brendan.scot> MIME-Version: 1.0 X-MBO-SPAM-Probability: * X-Rspamd-Score: 0.56 / 15.00 / 15.00 X-Rspamd-Queue-Id: C99D126C X-Rspamd-UID: d90505 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 * guix/build/qt-build-system.scm (wrap-all-programs): Excluded wrapped programs from the list of files to wrap if they exist to avoid double wrapping. --- guix/build/qt-build-system.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/guix/build/qt-build-system.scm b/guix/build/qt-build-system.scm index 005157b0a4..4738ca09c9 100644 --- a/guix/build/qt-build-system.scm +++ b/guix/build/qt-build-system.scm @@ -83,7 +83,10 @@ add a dependency of that output on Qt." (define (find-files-to-wrap directory) (append-map (lambda (dir) - (if (directory-exists? dir) (find-files dir ".*") (list))) + (if (directory-exists? dir) + (find-files dir (lambda (file stat) + (not (wrapped-program? file)))) + '())) (list (string-append directory "/bin") (string-append directory "/sbin") (string-append directory "/libexec")