From unknown Mon Aug 18 11:25:54 2025 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-Spam-Score: -1.4 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) * 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 From unknown Mon Aug 18 11:25:54 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Brian Kubisiak Subject: bug#74682: closed (Re: [bug#74682] [PATCH] gnu: squashfuse: Fix cross compiling.) Message-ID: References: <87pllpkzjv.fsf@gnu.org> <50ad8da346a0a35d4873de7c9ccd10a793c02bf7.1733282255.git.brian@kubisiak.com> X-Gnu-PR-Message: they-closed 74682 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 74682@debbugs.gnu.org Date: Wed, 18 Dec 2024 11:22:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1734520922-21791-1" This is a multi-part message in MIME format... ------------=_1734520922-21791-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #74682: [PATCH] gnu: squashfuse: Fix cross compiling. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 74682@debbugs.gnu.org. --=20 74682: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D74682 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1734520922-21791-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 74682-done) by debbugs.gnu.org; 18 Dec 2024 11:21:17 +0000 Received: from localhost ([127.0.0.1]:33701 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tNs77-0005eC-GC for submit@debbugs.gnu.org; Wed, 18 Dec 2024 06:21:17 -0500 Received: from eggs.gnu.org ([209.51.188.92]:56742) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tNs6y-0005d2-6V for 74682-done@debbugs.gnu.org; Wed, 18 Dec 2024 06:21:10 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tNs6s-0002GK-9c; Wed, 18 Dec 2024 06:20:58 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=052STyBidNdhgbadqoI8gYUwmmRwPDp4KDfd6FbiMUU=; b=IwGCHP9arq6cmHE7H2Qz 5mvUN8UOB3fenFo6Bhv6257UwafxOs9vje3/2+MrDYsyHjao0lFStcTt0Ha2XQcWqcmajtByiUeMd nbJd6irmTIp7hufxP0RLxxzENHLStI7PyW/BNvXRLX1IGeK3CZpKDpMoF3rIhdlJ/FSR/BL42x+le B8ZKEe+bvvs0fAmKzovIbg5IKYKYVEJ08iyljx5ymu8wxgFIjquJMt34ecFqWi7+iqmRZ2jKaBCYc ZAP7zxutYOVH7DguB36ZADX9/apVJ+Q6tQkO7IKt+fP6ccAfMVHzos1vjfcWI2aCh+Tju8yiISC/6 nJ4jlP+TMojvLA==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Brian Kubisiak Subject: Re: [bug#74682] [PATCH] gnu: squashfuse: Fix cross compiling. In-Reply-To: <50ad8da346a0a35d4873de7c9ccd10a793c02bf7.1733282255.git.brian@kubisiak.com> (Brian Kubisiak's message of "Tue, 3 Dec 2024 19:17:55 -0800") References: <50ad8da346a0a35d4873de7c9ccd10a793c02bf7.1733282255.git.brian@kubisiak.com> Date: Wed, 18 Dec 2024 12:20:36 +0100 Message-ID: <87pllpkzjv.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 74682-done Cc: 74682-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Brian Kubisiak skribis: > * 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 Applied, thanks! ------------=_1734520922-21791-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit 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 To: guix-patches@gnu.org Subject: [PATCH] gnu: squashfuse: Fix cross compiling. 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-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) * 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 ------------=_1734520922-21791-1--