From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.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 YADrCSfmQmd49QAA62LTzQ:P1 (envelope-from ) for ; Sun, 24 Nov 2024 08:39:03 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id YADrCSfmQmd49QAA62LTzQ (envelope-from ) for ; Sun, 24 Nov 2024 09:39:03 +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=axAYRAKB; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=T1YQoHn5; dmarc=pass (policy=none) header.from=gnu.org; 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=1732437542; a=rsa-sha256; cv=none; b=Z1cRXYMzfr021VgPKrRPJFjKTIS9+R3kzddzlT0fMIzRzQYwe3QsKsNBW5kLNMc86L7dXG B0tvt/JAtuNzmbSFVx95SXhcpXpKSCkIyE1CTefSrP0qKk6CcxnFuBxzLJEBrz4tz3t+v5 7QsHy9i7SZc/NjNGPCbGouMbqw7fPweNS+38JpcC+jl0mgMPU6E36P4JZY2sgN01Vpn2wN B2dh5N543dM6w7JCkM9/q6awu7I7XK83+rn2IdHocXqCwoYyR9s1sS9m1gP8y1IDVH9B0Q nZYNeF8fIhToBfeCGrmYrMqbDz+Op6lL1bEZql/7AewU0WN0GOc95SOXYfl89Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=axAYRAKB; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=T1YQoHn5; dmarc=pass (policy=none) header.from=gnu.org; 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=1732437542; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=8M4Se2G0z5j9rnEsYXphTkJWt/+tkYJEhC0ET8Pjbfk=; b=gBAulxuPVD9/6U2E+3Y9UGjSonSP4S7YaZdS+7G97DM9bEAvsSNaa1U4+ZHGC/4c4MBij2 cPOPeTm2oaxJw5e2ezxNumb9qJGABpJmKMmcZoSWWhkPpnLRst00gEZqjZVsLIEwiufWmM nD+HLRZSMxchv/RUXWeJohxn+1aQJpIN1NwfID9mZpIhdvYfJ2EFCyxPsrTHv+E0cW9nt2 e1LRLs3pktfzguccv6geV5RP/QtGulYvwd9lcjFl+ydNAfglCEnvvlIwNhpcOoR0Y6NnvQ OrA2cxd2nMZwOtUwqBGDC9kECDdp/oVjvU8YySqWLhFy61CIPu6VYDQz/rAv1g== 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 B96985188 for ; Sun, 24 Nov 2024 09:39:01 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF7Ui-0000Oy-3P; Sun, 24 Nov 2024 02:57:24 -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 1tF7Uc-0000Hp-Kv for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57: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 1tF7UZ-0002LW-DZ; Sun, 24 Nov 2024 02:57: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=8M4Se2G0z5j9rnEsYXphTkJWt/+tkYJEhC0ET8Pjbfk=; b=axAYRAKB7IcaQlDthNjiTGKFPPjHVJA+im5KXCBQMgpvo9dT24m3Gs0a4ok3dCWcvx0/SLNf/kWp8Cw3dZF7+T60d5hbkNY1CnVTGbVmP6fGKPqmHbmwNSAYfO4SUwHSD/e6agkASyQVKHK6dmfb248QGiJd9U+1F+q/hpR4/pgdgayWQOvlxvm3QAppqfUrxGpsxJgrsY96yyd9OhGcFx9LdHDdHPZuoqqlJE8bsjcP9jhwBQfR6CaD+u6XeZCViZAyT0JXwiDM0qT5RNAWsiO+hchK07hVedUfrhaQj8YYuKCAyBdSmAasv2/7pyJ1pbBxm7/IYdQb768XiGa9aw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF7UZ-0004in-7e; Sun, 24 Nov 2024 02:57:15 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 23/58] 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: Sun, 24 Nov 2024 07:57:15 +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?Court=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243500917803 (code B ref 74290); Sun, 24 Nov 2024 07:57:15 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:56:49 +0000 Received: from localhost ([127.0.0.1]:60767 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7U8-0004cs-9h for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:48 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60322) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Tg-0004YH-VQ for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:23 -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 1tF7Tb-000283-Oh; Sun, 24 Nov 2024 02:56:15 -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=8M4Se2G0z5j9rnEsYXphTkJWt/+tkYJEhC0ET8Pjbfk=; b=T1YQoHn52nMu98k0VZJg Rwjy/8y59QasbBcreSnX/sZ76lx+JcPcMg5UiqbbPcBwYjj7/34IPGymmeIySaXi5Gg1GvgEY56XP 2SHrsUVqrcW4BhiV5P7Bz+QX/AINHPtEQJ0AmOljDkwdYC+2ALo3RfRHgztjTHYzke4xFtyLNFe7V feOT3xHvlyitveuyG4mz+nREeSFQqSDrLF0emobd9oYxBwa12rwmP0x3c/20uCmGDRHI3hx9n+Nsz WP7FPdWrj8B4nycKS+AW5hu/HNEdis2dGEWuCeSfDkOKJUfSAAgCbdp5qfUCxow320lsXBsK6D0TO /7GIXyHk18PhGA==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:46 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: -3.53 X-Spam-Score: -3.53 X-Migadu-Queue-Id: B96985188 X-Migadu-Scanner: mx12.migadu.com X-TUID: iBmJC0k5kObm * 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 f15272f25c..3df0d4effa 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1515,6 +1515,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 <