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 sPePCUlpWWfABAEAe85BDQ:P1 (envelope-from ) for ; Wed, 11 Dec 2024 10:28:25 +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 sPePCUlpWWfABAEAe85BDQ (envelope-from ) for ; Wed, 11 Dec 2024 11:28:25 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=SpInXtrU; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b="FRS/qbfi"; 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=1733912905; a=rsa-sha256; cv=none; b=Shlp79FsS+Pah+Tvux+AjWIDuNf4fq7VdhVzxGGGJDuG08ekfJxLISkGYKT1FtGin2MrSw SDxcBkEN8GAMXtyNuKD79dR+HK1Aiv2dF1il8F379D7Jr8nhoP5E1xw0vQW3ZR64tXY7f9 yO6Fv9shPMZvN95HbRUfRdKcbhErBu0FPTr4ZIAh58X5xHvaB3HqLHCWUrtX2HmMFkBcTo 2zgVSjxSVGAHTHr1z8i9MR95j9axhNy4g07HOqCm2r+iO1djPUog+TK6Ac4XhxG7dAEdlo 3rn45NLFLdVQWy0v/u/AGE8UHCYvzNuJyJQn1TmjxdKhL5aXTD6xWtzx8d98QQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=SpInXtrU; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b="FRS/qbfi"; 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=1733912905; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=vgOGPIdtkQp2HHXLascu46+ivAvoK3JISWEgJDkgq3I=; b=XaI57PRTOeSCv7MyB3KXBfvYSdrpg+xS4047dvUsEPPTViIPXRvzN4QYtWxzFcsVq4S8Fd 43EiZbLQUB3S0xinMvRfL4pkaMWSHfyBy4JFHde62bTYw3MsBWRqbuN6TsMXRbj4jlqvPq oyQk5bTQU5U5w1VI0ItqoUHrV3BJn+nkc64LUoWsYaMP0DdDaBD25Xy8zacICuRZ0QIJiG ke6wGKDE1qDXIOO1Jf3XoMLS8QYpokGAg1K/WKNAhVakN+xVYKxjwxBAs+FY4tsNPYaWuU dV/uuNe7dMaQPQapwMecanz0jnCvruZXkAX633yQrWy3EtlEn6bjoJoQoKAJmw== 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 9D9EE647A for ; Wed, 11 Dec 2024 11:28:24 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tLJwr-0007fP-H0; Wed, 11 Dec 2024 05:28: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 1tLJwp-0007fD-7i for guix-patches@gnu.org; Wed, 11 Dec 2024 05:28:03 -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 1tLJwo-0000xR-Uk for guix-patches@gnu.org; Wed, 11 Dec 2024 05:28:02 -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:Date:From:To:Subject; bh=vgOGPIdtkQp2HHXLascu46+ivAvoK3JISWEgJDkgq3I=; b=SpInXtrUQb61oGbU8IoAw27XyANaeWskISKvvJPFpJgWxiFO4SQccu9WVWHYIQRl5oICCwjGr2L5LWgO0aANDiSQcDhhJupDQxE9Riacx495CWK5jvt+K21lPVOrVd+qtn/W5JHV99RmoUgCWEa+lZLTptSeKv1jcRM5F3Gq4HhwLldNxJzBVuHteMqsmmzSqqmRzxB8e986s9q0jNRBNaGpzCFWSVOsav5D/gQG+Vv77gJn+rQ1NOsCJdSQ4AwsCIIDJYVNbyg7q8ytm/EZXhphahRvu1OkmJyOTotsb0vHPjbrHyz+5HowrMqgpf0VjlB2R6Njuie2dxegHYg/JQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tLJwn-0004Oq-PJ for guix-patches@gnu.org; Wed, 11 Dec 2024 05:28:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74784] [PATCH] gnu: hugs: Fix build with GCC. Resent-From: Homo Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 11 Dec 2024 10:28:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 74784 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74784@debbugs.gnu.org Cc: Homo X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.173391282716758 (code B ref -1); Wed, 11 Dec 2024 10:28:01 +0000 Received: (at submit) by debbugs.gnu.org; 11 Dec 2024 10:27:07 +0000 Received: from localhost ([127.0.0.1]:33086 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tLJvu-0004ME-SL for submit@debbugs.gnu.org; Wed, 11 Dec 2024 05:27:07 -0500 Received: from lists.gnu.org ([209.51.188.17]:45820) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tLJvs-0004M5-Kl for submit@debbugs.gnu.org; Wed, 11 Dec 2024 05:27: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 1tLJvs-0007cg-3H for guix-patches@gnu.org; Wed, 11 Dec 2024 05:27:04 -0500 Received: from layka.disroot.org ([178.21.23.139]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tLJvo-0000uq-BB for guix-patches@gnu.org; Wed, 11 Dec 2024 05:27:03 -0500 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 15DA024E17; Wed, 11 Dec 2024 11:26:57 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id JPCJQVIC_GDc; Wed, 11 Dec 2024 11:26:52 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1733912812; bh=yx6v7OFjRhdoWROEeaJNFEfmsSD9WdFw2Eu0a9PuaYw=; h=From:To:Cc:Subject:Date; b=FRS/qbfinB15ETt+xAmR+mQ4sdIuQ9yOzLL59fXbyETNt71snIRO+Cbjxas1xeLaO ibFHIC7IRtbh/m961W7rVYVWUfKX17FVy6p0xc6LmE4cgPCSytlcmQIroaDs986Knt tvq9sxcBwr6kHRInxvZLUaX5KZO3/dqA0iYefX9dfLEqh+20PsDNIXL+HDvn3ybkbl 9kGnMaKOSfUU37Dk1pbP5JhUfvjKhTqamG0ByrMxwO9PJ0AoKFpgUEAjG2YxAWDZL9 BiAGP/z1v4xON5Gp8mwu/OW2HBVFWdE513jq/XPEc/+beXcQr3K5JFbiMQ+pQMT59V KeRk0AnX/PQ2w== Date: Wed, 11 Dec 2024 12:26:36 +0200 Message-ID: <20241211102636.20121-1-gay@disroot.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=178.21.23.139; envelope-from=gay@disroot.org; helo=layka.disroot.org X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: , Reply-to: Homo X-ACL-Warn: , Homo via Guix-patches From: Homo via Guix-patches via 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.04 X-Spam-Score: 1.04 X-Migadu-Queue-Id: 9D9EE647A X-Migadu-Scanner: mx12.migadu.com X-TUID: 9zKsRj0yA4B6 Change-Id: I6bbfb65e62d9a2b1a3c8b29eb386a24d6974eb45 --- gnu/packages/hugs.scm | 7 +++---- gnu/packages/patches/hugs-fix-build.patch | 21 +++++++++++++++++++++ 2 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 gnu/packages/patches/hugs-fix-build.patch diff --git a/gnu/packages/hugs.scm b/gnu/packages/hugs.scm index c9915e4cd6..b6a97ea78c 100644 --- a/gnu/packages/hugs.scm +++ b/gnu/packages/hugs.scm @@ -23,7 +23,7 @@ (define-module (gnu packages hugs) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu) - #:use-module (gnu packages gcc)) + #:use-module (gnu packages)) (define-public hugs (package @@ -36,7 +36,8 @@ (define-public hugs name "98-plus-" version ".tar.gz")) (sha256 (base32 - "1mdy4aq4campgmnpc2qwq7bsbfhaxfsqdghbyyz2wms4lnfcmyma")))) + "1mdy4aq4campgmnpc2qwq7bsbfhaxfsqdghbyyz2wms4lnfcmyma")) + (patches (search-patches "hugs-fix-build.patch")))) (build-system gnu-build-system) (arguments `(#:phases @@ -71,8 +72,6 @@ (define-public hugs (("/bin/cp") (which "cp"))) #t))) #:tests? #f)) ; no test target - ;; FIXME: Fails to build with GCC 5. - (native-inputs (list gcc-4.9)) (home-page "https://www.haskell.org/hugs/") (synopsis "Functional programming system based on Haskell 98") (description diff --git a/gnu/packages/patches/hugs-fix-build.patch b/gnu/packages/patches/hugs-fix-build.patch new file mode 100644 index 0000000000..d41bec4d8b --- /dev/null +++ b/gnu/packages/patches/hugs-fix-build.patch @@ -0,0 +1,21 @@ +diff --git a/packages/base/include/HsBase.h b/packages/base/include/HsBase.h +index aa1a7fb..78d5b46 100644 +--- a/packages/base/include/HsBase.h ++++ b/packages/base/include/HsBase.h +@@ -217,15 +217,7 @@ StgWord64 stg_integerToWord64 (StgInt sa, StgByteArray /* Really: mp_limb_t* */ + when compiling to native code. + -------------------------------------------------------------------------- */ + +-#ifndef INLINE +-# if defined(_MSC_VER) +-# define INLINE extern __inline +-# elif defined(__GNUC__) +-# define INLINE extern inline +-# else +-# define INLINE inline +-# endif +-#endif ++#define INLINE inline + + INLINE int __hscore_get_errno(void) { return errno; } + INLINE void __hscore_set_errno(int e) { errno = e; } -- 2.46.0