From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id UBQ8KEXKT2dnAgEAe85BDQ:P1 (envelope-from ) for ; Wed, 04 Dec 2024 03:19:33 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id UBQ8KEXKT2dnAgEAe85BDQ (envelope-from ) for ; Wed, 04 Dec 2024 04:19:33 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=R7e2i3ua; dkim=fail ("headers rsa verify failed") header.d=kubisiak.com header.s=s1 header.b=SiFooeuS; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1733282373; a=rsa-sha256; cv=none; b=XE1/HBpsxRTtntvCt9xkEtGj3X/Djhw30KERmPJUzyNjpXcjQEf47f27paTZc8U0ezIJpK jJNS6FV5kbEKzBuwFZx5PmP1NEQn8OjJdBtPIampUt8cjczYbsRbZ0MGm0jszO+CxlYBBI ExjdSi7SeDb6icIGjPAbNZuTJD4F/ErUeor4jeZe3bxim4jMLPg222NiT2ugAsR4mB3kBs k3xGjeZdTxDKpAnxmQ9q5EbDatLdsmkJc5oyTgvDRkqYaZgmyTjZQ2BHdqDaJPvdzwz0YM QAQG5wDIGVu9igK9hemhA+292r4VIm8mAhRv0RfT1JrTMqBzhD1bemSqABKScg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=R7e2i3ua; dkim=fail ("headers rsa verify failed") header.d=kubisiak.com header.s=s1 header.b=SiFooeuS; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1733282373; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:list-id:list-help:list-unsubscribe:list-subscribe: list-post:dkim-signature; bh=1CcNxJqi9lImchnN9pbAsSkDAQqmX4AiVYV/em2OzAQ=; b=IaeP4YLzH+6CYFzeTpGmcw5SoJRh9LEwqwY23yeqsurmzF8x0jZef/aDdYkEKPQg3QL7Jp LtPpWVmoF5HGU2qu+WklUFEOC2SKBEBOPWziAcdqULep70WWZqdG/ulUh99Zj43Bkd1a8Y GldOygqagRnAux5zKj0TW7IBT5NgOa2Tmx0QWR1QfIfbr803jNdYm2Vpo1vpVlN0BAiu2Q wkD5xavgOTr8NydFZD6qbwjvUyxG47EIMDpiusjCMlhQcohXiOl3uuzf2D0QddxppEKc7H N3GVjWvOVIqJzbdsXm4M4kB6sSlXNH37VN6udK9Q3fi6ufsbqjySQQTSFjQBpg== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 14C2D82C34 for ; Wed, 04 Dec 2024 04:19:33 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tIfus-0000Q0-4R; Tue, 03 Dec 2024 22:19:06 -0500 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 1tIfuq-0000Ps-3B for guix-patches@gnu.org; Tue, 03 Dec 2024 22:19:04 -0500 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 1tIfup-0003S6-Ps for guix-patches@gnu.org; Tue, 03 Dec 2024 22:19:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:From:Date:To:Subject; bh=1CcNxJqi9lImchnN9pbAsSkDAQqmX4AiVYV/em2OzAQ=; b=R7e2i3uaZekzsVv9jQEfw7Q6+DzgsK7+Vifz6mPWCYiumgzlCllAOdfi6LxXTdWaMCD9cq/ypnCik4NymHGIMb002C9XCL9VcEe31bvWfJYFUlWNsiQ/clo27otlAdv4zh3AXGey0uoh3MegsWIX/i87Ce6Cv4/3ZVh3CdYODYFs7b8OIO1P/Ryqw+gvKaLaPyWFBDv8cNi/xJkbuHFFKKZp4EAEPBtj/0UrRHU0peSIEy+pGKAPai9PYtYdyZFVKj3Z+bTd5i4n6r6MXh5q8DZJC9oRbql1wje9mIpfkcsbhHVaflLDV++uTwLjZdOdsrTGqkViC8sSdBkPcWz8sw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tIfuo-0004v0-JX for guix-patches@gnu.org; Tue, 03 Dec 2024 22:19:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74682] [PATCH] gnu: squashfuse: Fix cross compiling. Resent-From: Brian Kubisiak Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 04 Dec 2024 03:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 74682 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74682@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.173328228718823 (code B ref -1); Wed, 04 Dec 2024 03:19:02 +0000 Received: (at submit) by debbugs.gnu.org; 4 Dec 2024 03:18:07 +0000 Received: from localhost ([127.0.0.1]:33623 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tIftu-0004tW-Mb for submit@debbugs.gnu.org; Tue, 03 Dec 2024 22:18:07 -0500 Received: from lists.gnu.org ([209.51.188.17]:39036) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tIftr-0004tM-4y for submit@debbugs.gnu.org; Tue, 03 Dec 2024 22:18:05 -0500 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 1tIftq-0000LV-Us for guix-patches@gnu.org; Tue, 03 Dec 2024 22:18:02 -0500 Received: from [75.171.110.13] (helo=mail.kubisiak.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tIftp-0003MS-3e for guix-patches@gnu.org; Tue, 03 Dec 2024 22:18:02 -0500 dkim-signature: v=1; a=rsa-sha256; d=kubisiak.com; s=s1; c=relaxed/relaxed; q=dns/txt; h=From:Subject:Date:Message-ID:To:MIME-Version:Content-Type; bh=1CcNxJqi9lImchnN9pbAsSkDAQqmX4AiVYV/em2OzAQ=; b=SiFooeuS7/+D90SJ2GfHwhR4eTvKFNJJ+hnxDEP1m1n9Q+vTx9L9M6yZUulUi77iyL56o7RBJDDkrVOP/fNJDZFR9QKqs5Tc6RjkJBsGGeAepoRVd9RyCmoXALwQK5faFB1o89H0Sqd89BT6SDFCTTek2ScQV0CsYZcPIrq3CmCLtb4biH5uZD9vAohevVLlF+0oB8eN+qEogRH1XDGMB+2KHsBwMmrbR5DHMz7nXUIMb7zjWaq/6o7ntv 6M2TE3M8q3XudYnGB5eTYW6FTfHRe/XgG9Wmarhvs2ugtMKSv+qCLVqbLSHGdXHMTpe8Aq1+zARJWXRC+hoysdl0QhVQ== Received: from peregrine (135-180-130-213.dsl.dynamic.sonic.net [135.180.130.213]) (envelope-sender ) by mail.kubisiak.com with ESMTPSA id <50ad8da346a0a35d4873de7c9ccd10a793c02bf7.1733282255.git.brian@kubisiak.com> for (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256) ; Tue, 3 Dec 2024 21:17:57 -0600 Date: Tue, 3 Dec 2024 19:17:55 -0800 From: Brian Kubisiak Message-ID: <50ad8da346a0a35d4873de7c9ccd10a793c02bf7.1733282255.git.brian@kubisiak.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Host-Lookup-Failed: Reverse DNS lookup failed for 75.171.110.13 (failed) Received-SPF: pass client-ip=75.171.110.13; envelope-from=brian@kubisiak.com; helo=mail.kubisiak.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RDNS_NONE=0.793, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -1.43 X-Spam-Score: -1.43 X-Migadu-Queue-Id: 14C2D82C34 X-Migadu-Scanner: mx12.migadu.com X-TUID: tbW7ximnw5vg * gnu/packages/file-systems.scm (squashfuse)[arguments]: Use pkg-config-for-target. (squashfuse-for-appimage)[arguments]: Use substitute-keyword-arguments to modify inherited phases instead of %standard-phases. Change-Id: I6e52a94e46c5a89ba215a7eaceb7f54a80c52429 --- gnu/packages/file-systems.scm | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 46febebb0d..0d61277f98 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -2049,6 +2049,15 @@ (define-public squashfuse (sha256 (base32 "03aw8pw8694jyrzpnbry05rk9718sqw66kiyq878bbb679gl7224")))) (build-system gnu-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-cross-compile + (lambda _ + (substitute* "autogen.sh" + (("pkg-config") + #$(pkg-config-for-target)))))))) (native-inputs (list autoconf automake libtool pkg-config)) (inputs (list attr fuse-2 xz zlib `(,zstd "lib"))) (home-page "https://github.com/vasi/squashfuse") @@ -2063,17 +2072,18 @@ (define-public squashfuse-for-appimage (package (inherit squashfuse) (arguments - (list + (cons* #:configure-flags #~'("CFLAGS=-ffunction-sections -fdata-sections -Os -no-pie" "LDFLAGS=-static") - #:phases - #~(modify-phases %standard-phases - (add-after 'install 'install-private-headers - (lambda _ - (install-file "fuseprivate.h" - (string-append #$output - "/include/squashfuse/"))))))) + (substitute-keyword-arguments (package-arguments squashfuse) + ((#:phases phases) + #~(modify-phases #$phases + (add-after 'install 'install-private-headers + (lambda _ + (install-file "fuseprivate.h" + (string-append #$output + "/include/squashfuse/"))))))))) (inputs (list fuse-for-appimage `(,zstd "lib") `(,zstd "static") base-commit: 9001514e242ad15c190588439930b0fa4f6782e3 prerequisite-patch-id: cd0707c90e1d321f3f16f2f861313dd330e9f0b4 prerequisite-patch-id: d2efb4b89763c5df04dd6d980afd8756401ba24f -- 2.46.0