From patchwork Sun Mar 23 07:23:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 40700 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 D700D27BBE9; Sun, 23 Mar 2025 07:26:24 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-5.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI, PDS_OTHER_BAD_TLD,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id BC73727BBE2 for ; Sun, 23 Mar 2025 07:26:22 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1twFie-0008R9-FT; Sun, 23 Mar 2025 03:26:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1twFid-0008Ql-KS for guix-patches@gnu.org; Sun, 23 Mar 2025 03:26:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1twFid-0007Pn-3L for guix-patches@gnu.org; Sun, 23 Mar 2025 03:26:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=4dyk8EhTBpU4zaPXLxseyoCZCVCVNbObU/8XSgx1X8g=; b=XTX0pv35UkHnYFu9J4svHFLZIQXvqwmSOx46X/iFCRm6X+IQcWcUNmx9u08dno/fzDORxoE1o9+JWueQmJ/meQSS/2HEQcGolCNPNXH5YOhRbzNMBgjl4Esg694QQKJySbToaD1K3fbPAd77syZjKwJ506m85re6asX7X0to4dRjSu9CvSD2ylN/qIz7KP6a56FQp5kC5SbWtm3sjLl3IsiS7bC0ciJrnuE+CSKc7aY26FaHWTxdxfjbPxNeeDqvDjeuZeqGzyO7jBVKDrNKhRwhSGxFjqPpGmRpBk70oomAnz30XyYYwaGbK1phNabR2cer9A5IQk16ijgDw+icsQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1twFic-0003eP-Bi; Sun, 23 Mar 2025 03:26:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77093] [PATCH rust-team v3 02/17] build/cargo: Print out all non-empty binary files. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: hako@ultrarare.space, efraim@flashner.co.il, maxim.cournoyer@gmail.com, divya@subvertising.org, steve@futurile.net, guix-patches@gnu.org Resent-Date: Sun, 23 Mar 2025 07:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77093 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77093@debbugs.gnu.org Cc: Hilton Chain , Hilton Chain , Efraim Flashner , Maxim Cournoyer , Divya Ranjan Pattanaik , Steve George X-Debbugs-Original-Xcc: Hilton Chain , Efraim Flashner , Maxim Cournoyer , Divya Ranjan Pattanaik , Steve George Received: via spool by 77093-submit@debbugs.gnu.org id=B77093.174271472413697 (code B ref 77093); Sun, 23 Mar 2025 07:26:02 +0000 Received: (at 77093) by debbugs.gnu.org; 23 Mar 2025 07:25:24 +0000 Received: from localhost ([127.0.0.1]:47263 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1twFhx-0003YQ-BY for submit@debbugs.gnu.org; Sun, 23 Mar 2025 03:25:24 -0400 Received: from mx.boiledscript.com ([2a01:4f8:10b:392::42]:39440) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1twFho-0003TU-J3 for 77093@debbugs.gnu.org; Sun, 23 Mar 2025 03:25:14 -0400 From: Hilton Chain DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=mail; t=1742714711; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4dyk8EhTBpU4zaPXLxseyoCZCVCVNbObU/8XSgx1X8g=; b=KsoGJCp/ovpUDNazgqtT7VNkuTjlFZQJEaqWW7o8F7ya2sFO+9f7XebQqbiF5gxauw2t0y rW25hdHAG71zIUR7AyEgGsmAI842bfDNnX8Dgs9E+znkr6m2Loi0lSN3UPjK7DghFKrA8r cd44cPrmSIyCFBPxLi6Mhz2nv/nFWGDaSG4+pTL9k46VWAr4d15bAxalCJbJDX+s9K0sx7 CuibCXyNeX/4rzWTSiizgLzJ4foa2PzjVVQDDQmvv33BGpDsFX/EXDee8731fMRPpxhzkF WlT9Ew6VphQiUysSSH3428KUPnMoQ4igSoh0U+DAuGRpHS3Y14BFqrwSga1e8A== Date: Sun, 23 Mar 2025 15:23:06 +0800 Message-ID: In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * guix/build/cargo-build-system.scm (%standard-phases): Move 'unpack-rust-crates after 'unpack. Move 'check-for-pregenerated-files after 'configure. (check-for-pregenerated-files): Only check non-empty files. Print out binary files. Run in parallel. Don't fail to keep compatibility for phase order change. Change-Id: I0a332fe843e97687324bd908fa111422a63e475d --- guix/build/cargo-build-system.scm | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/guix/build/cargo-build-system.scm b/guix/build/cargo-build-system.scm index 41f54f42b7..58238992b8 100644 --- a/guix/build/cargo-build-system.scm +++ b/guix/build/cargo-build-system.scm @@ -29,9 +29,11 @@ (define-module (guix build cargo-build-system) #:use-module ((guix build utils) #:hide (delete)) #:use-module (ice-9 popen) #:use-module (ice-9 rdelim) + #:use-module (ice-9 regex) #:use-module (ice-9 ftw) #:use-module (ice-9 format) #:use-module (ice-9 match) + #:use-module (ice-9 threads) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) #:export (%standard-phases @@ -111,12 +113,29 @@ (define* (unpack-rust-crates #:key inputs vendor-dir #:allow-other-keys) (define (rust-package? name) (string-prefix? "rust-" name)) -(define* (check-for-pregenerated-files #:rest _) +(define* (check-for-pregenerated-files #:key parallel-build? #:allow-other-keys) "Check the source code for files which are known to generally be bundled libraries or executables." - (let ((pregenerated-files (find-files "." "\\.(a|dll|dylib|exe|lib)$"))) - (when (not (null-list? pregenerated-files)) - (error "Possible pre-generated files found:" pregenerated-files)))) + (format #t "Searching for binary files...~%") + (let ((known-pattern (make-regexp "\\.(a|dll|dylib|exe|lib)$")) + (empty-file? + (lambda (filename) + (call-with-ascii-input-file filename + (lambda (p) + (eqv? #\0 (read-char p))))))) + (n-par-for-each + (if parallel-build? + (parallel-job-count) + 1) + (lambda (file) + (unless (empty-file? file) + ;; Print out binary files. + (false-if-exception (invoke "grep" "-IL" "." file)) + ;; Warn about known pre-generated files. + ;; Not failing here for compatibility with existing packages. + (when (regexp-exec known-pattern file) + (format #t "error: Possible pre-generated file found: ~a~%" file)))) + (find-files ".")))) (define* (configure #:key inputs target system @@ -380,8 +399,8 @@ (define %standard-phases (replace 'check check) (replace 'install install) (add-after 'build 'package package) - (add-after 'unpack 'check-for-pregenerated-files check-for-pregenerated-files) - (add-after 'check-for-pregenerated-files 'unpack-rust-crates unpack-rust-crates) + (add-after 'unpack 'unpack-rust-crates unpack-rust-crates) + (add-after 'configure 'check-for-pregenerated-files check-for-pregenerated-files) (add-after 'patch-generated-file-shebangs 'patch-cargo-checksums patch-cargo-checksums))) (define* (cargo-build #:key inputs (phases %standard-phases)