From patchwork Tue Nov 19 06:54:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70513 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 EACC927BBEA; Tue, 19 Nov 2024 06:59:33 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 5347927BBE2 for ; Tue, 19 Nov 2024 06:59:33 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tDICm-0008R1-NX; Tue, 19 Nov 2024 01:59:20 -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 1tDICk-0008PK-Gl for guix-patches@gnu.org; Tue, 19 Nov 2024 01:59:18 -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 1tDICk-0004Kp-7L; Tue, 19 Nov 2024 01:59:18 -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:References:In-Reply-To:Date:From:To:Subject; bh=G0CmL8P0BdY2Fsasn7TwU3ZyPbmzzXdztEUf+ZRljYw=; b=HznLlQUaXUtpFJDOcUVIw0FVdZv6QSb/bCqmGo9qwLeTWmh1v6TnTiUu/qTzbaqGCUAkydh/Hcwsy2rRPOaj4vfBXqyqpaYukJo8nE/UQSeqMgrztj35F5iAuFFjz/BnVcXHe8RgAus7ZizKkGBddqG+AIAfxKjDSq2YFo3sXJUTCTpytcgLAWCTaT1EG7Ow2dLT6wveESSCAoAx1VmAAA6JGtzvKurpSdr3lKUeviPb43r2tVWxCXnTTo3vjD6T/ui9BX18cIdFaSOIAubsSaQ9zh4oWGy261zXp/9gMFMyT7k/wKgl8Qej1Q+IL2U7UeR1shzufsf5o3jAP93gfw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tDICk-0005Ic-2u; Tue, 19 Nov 2024 01:59:18 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v3 23/51] gnu: guile-lzlib: Support [cross-]build with gcc-14 and the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, ludo@gnu.org, guix-patches@gnu.org Resent-Date: Tue, 19 Nov 2024 06:59:18 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Cc: Andreas Enge , Ludovic =?utf-8?q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Andreas Enge , Ludovic =?utf-8?q?Co?= =?utf-8?q?urt=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173199954220054 (code B ref 74290); Tue, 19 Nov 2024 06:59:18 +0000 Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:59:02 +0000 Received: from localhost ([127.0.0.1]:40544 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDICT-0005DC-Ma for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:59:02 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39368) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIBv-00057g-JO for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:58:29 -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 1tDI9k-00040L-Vn; Tue, 19 Nov 2024 01:56:12 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=G0CmL8P0BdY2Fsasn7TwU3ZyPbmzzXdztEUf+ZRljYw=; b=CTMMWnola7iHf/d7HoQw WdVLZOrL29DJm2zIYc85hh2EqvFvMNxifh770+owShXQJo0kKKH1knHHwwwSKxS1ryCxlCmUjkonT Fzv0zg5wCBL7BYmoAJJb+6N0W1oEm0Vt8t5D8vWBXoG4jkRigTHtrHfMKwJ3zi1Cy3paL5kWeI2Xv BTaJY3XsdcLiffG2ju9P4G0jYH079Q/JDcy5+Z2YZ2A0A3bCU7+p+z7XnV+uJbhkkzU48UkqBdLQ2 CtwIz182cE6GcPyk4YxiEpSdFMoP6OvZG2sT0o49rqBOZnX1fgAB01VA9gbb1GUrcWNZZYjV7O8P8 yBoFkDDhHaJgqQ==; From: Janneke Nieuwenhuizen Date: Tue, 19 Nov 2024 07:54:53 +0100 Message-ID: <00e60fa4abeb1cb337acf0a4ff0d56de2700e448.1731999203.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 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 * gnu/packages/patches/guile-lzlib-hurd64.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/guile.scm (guile-lzlib)[arguments]: Use G-expressions. When building for the 64bit Hurd, or cross-compiling, use it in new "apply-hurd64-patch" stage. Change-Id: Id03f71baa80e2f4f967f54037ce7d9f1c5dc4bb6 --- gnu/local.mk | 1 + gnu/packages/guile.scm | 16 ++++++++-- gnu/packages/patches/guile-lzlib-hurd64.patch | 32 +++++++++++++++++++ 3 files changed, 46 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/guile-lzlib-hurd64.patch diff --git a/gnu/local.mk b/gnu/local.mk index eb50df6e13..be6befb921 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1516,6 +1516,7 @@ dist_patch_DATA = \ %D%/packages/patches/guile-fix-invalid-unicode-handling.patch \ %D%/packages/patches/guile-gdbm-ffi-support-gdbm-1.14.patch \ %D%/packages/patches/guile-hurd-posix-spawn.patch \ + %D%/packages/patches/guile-lzlib-hurd64.patch \ %D%/packages/patches/guile-present-coding.patch \ %D%/packages/patches/guile-rsvg-pkgconfig.patch \ %D%/packages/patches/guile-ssh-rename-bool.patch \ diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 8dabbb2c5e..69dff9211f 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2014, 2016, 2018 David Thompson ;;; Copyright © 2014, 2017, 2018 Mark H Weaver ;;; Copyright © 2015, 2017 Christine Lemmer-Webber -;;; Copyright © 2016, 2023 Janneke Nieuwenhuizen +;;; Copyright © 2016, 2023, 2024 Janneke Nieuwenhuizen ;;; Copyright © 2016, 2017 Leo Famulari ;;; Copyright © 2016, 2019, 2020 Ricardo Wurmus ;;; Copyright © 2017 Andy Wingo @@ -962,8 +962,18 @@ (define-public guile-lzlib "1whgmwkr1v8m63p4aaqn8blwl9vcrswwhbfv4bm0aghl5a6rryd7")))) (build-system gnu-build-system) (arguments - '(#:make-flags - '("GUILE_AUTO_COMPILE=0"))) ;to prevent guild warnings + (list + #:make-flags #~'("GUILE_AUTO_COMPILE=0") ;prevent guild warnings + #:phases (if (or (%current-target-system) (target-hurd64?)) + #~(modify-phases %standard-phases + (add-after 'unpack 'apply-hurd64-patch + (lambda _ + (let ((patch + #$(local-file + (search-patch + "guile-lzlib-hurd64.patch")))) + (invoke "patch" "--force" "-p1" "-i" patch))))) + #~%standard-phases))) (native-inputs (list autoconf automake pkg-config guile-3.0)) (inputs (list guile-3.0 lzlib)) (synopsis "Guile bindings to lzlib") diff --git a/gnu/packages/patches/guile-lzlib-hurd64.patch b/gnu/packages/patches/guile-lzlib-hurd64.patch new file mode 100644 index 0000000000..12e8c3617d --- /dev/null +++ b/gnu/packages/patches/guile-lzlib-hurd64.patch @@ -0,0 +1,32 @@ +Upstream-status: Presented upstream. + +From 80dcd31562827f4b6d085affe9d9f22164f7ed34 Mon Sep 17 00:00:00 2001 +From: Janneke Nieuwenhuizen +Date: Fri, 15 Nov 2024 16:18:29 +0100 +Subject: [PATCH] build: Support the 64bit Hurd. + +* configure.ac: When cross-compiling declare LZ_decompress_open before +using it in conftest.c. +--- + configure.ac | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 50dc5ac..4c56768 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -32,7 +32,10 @@ AC_DEFUN([GUILE_LIBLZ_FILE_NAME], [ + [if test "$cross_compiling" = yes; then + # When cross-compiling, we cannot rely on 'ldd'. Instead, look + # the output of 'ld --verbose', assuming we're using GNU ld. +- echo 'int main () { return LZ_decompress_open(); }' > conftest.c ++ cat > conftest.c <