From unknown Fri Jun 20 07:18:01 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#74784 <74784@debbugs.gnu.org> To: bug#74784 <74784@debbugs.gnu.org> Subject: Status: [PATCH] gnu: hugs: Fix build with GCC. Reply-To: bug#74784 <74784@debbugs.gnu.org> Date: Fri, 20 Jun 2025 14:18:01 +0000 retitle 74784 [PATCH] gnu: hugs: Fix build with GCC. reassign 74784 guix-patches submitter 74784 Homo severity 74784 normal tag 74784 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Wed Dec 11 05:27:07 2024 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== From: Homo To: guix-patches@gnu.org Subject: [PATCH] gnu: hugs: Fix build with GCC. 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-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit Cc: Homo 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 (--) 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 From debbugs-submit-bounces@debbugs.gnu.org Sun Dec 15 18:19:25 2024 Received: (at 74784) by debbugs.gnu.org; 15 Dec 2024 23:19:25 +0000 Received: from localhost ([127.0.0.1]:52606 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tMxtQ-0001Eb-1i for submit@debbugs.gnu.org; Sun, 15 Dec 2024 18:19:25 -0500 Received: from eggs.gnu.org ([209.51.188.92]:53184) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tMxtK-0001EJ-Hw for 74784@debbugs.gnu.org; Sun, 15 Dec 2024 18:19:18 -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 1tMxtF-0005Dq-0U; Sun, 15 Dec 2024 18:19:09 -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=rzJW0J6M59bpzhnlSXF81H0olXRe9uqIq5Bv3AA2/w4=; b=UjCTzWGAaZIUOJwFeMac vx9led4BL8fHjPR4s0eRWkyDy1sEu/0euScO9IRgKxRm52SE0KDF9l2TfmMXPPDJmC7Gz8NvmGlFt /WAiHd0DyFaibf9DFP66DENKhKLr8WTiCfC64EoAtUTXC+I1KN1iOMLFf/weN6tXe/SmPFfoOIrpJ 6EyJJoDEfP/+bR8xavhpSh11wrcQ2yas/+NMwTrVtiA6iz3bVWu2Oy7jsgtIgZ35WiEfuOLZiOJo2 zHqdN6uJh26GDIkUK1XZRQinW5JUTg1YD0WqKPrlzxDAm8n2hS8Ba6n8AGC+GYw1YjhVc1l5H0ZOt 4Cg/44hpyCR3/g==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Homo Subject: Re: [bug#74784] [PATCH] gnu: hugs: Fix build with GCC. In-Reply-To: <20241211102636.20121-1-gay@disroot.org> (Homo's message of "Wed, 11 Dec 2024 12:26:36 +0200") References: <20241211102636.20121-1-gay@disroot.org> Date: Mon, 16 Dec 2024 00:19:00 +0100 Message-ID: <87seqofsbf.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 74784 Cc: 74784@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 (---) Hi, Homo skribis: > 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 A couple of minor nits but I think it=E2=80=99ll be useful if you plan to contribute more: > --- /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/HsBa= se.h > +index aa1a7fb..78d5b46 100644 Could you add a sentence at the top explaining what the patch does? (This will placate =E2=80=98guix lint=E2=80=99 in addition to myself. :-)) Could you also register the file in =E2=80=98gnu/local.mk=E2=80=99? Last, you can use =E2=80=98etc/committer.scm=E2=80=99 to generate a commit = log or template thereof that follow the project=E2=80=99s conventions. Thanks, Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 16 03:52:55 2024 Received: (at 74784) by debbugs.gnu.org; 16 Dec 2024 08:52:55 +0000 Received: from localhost ([127.0.0.1]:53432 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tN6qV-0003qe-39 for submit@debbugs.gnu.org; Mon, 16 Dec 2024 03:52:55 -0500 Received: from layka.disroot.org ([178.21.23.139]:57050) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tN6qS-0003qQ-7n for 74784@debbugs.gnu.org; Mon, 16 Dec 2024 03:52:53 -0500 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 12BE024EE5; Mon, 16 Dec 2024 09:52:51 +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 DXDTH30YBOpE; Mon, 16 Dec 2024 09:52:46 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1734339166; bh=RsiZeQ52fsRXQtBnT6ptVfaJiQDRKhvX/M001JsxDIw=; h=From:To:Cc:Subject:Date; b=bojD0e087tEk+hDQDLX6binFE9vn234z50mpgb0H4+U9uIxTmD9FazzLIybuH/MNN A3OenZSC7jE3iSdqscfLTj+JD0gU1RpgqPhkgbR7Vs11LtoQcvWSdJPOGbftgu/MRz TPaPXtQac9WXtSJMXtN6RU2uf1+motKyhva13C7XAwyI51uQzu15DWlxQzjyNnqWST vXzjViGiO+hsuGmqSi+SUs4CrlagIyukaJHyQ6deXSw0UWg9wrCnG1rOw62cRdCAwu 8Ar7afkQVvtqkXq8XMWRucewP2i/SxUOjVVjny/QMKM+ew2Q5nxJmK9CVuqm5XjQC3 xCwFimtm538JQ== From: Homo To: 74784@debbugs.gnu.org Subject: [PATCH v2] gnu: hugs: Fix build with GCC. Date: Mon, 16 Dec 2024 10:47:32 +0200 Message-ID: <20241216085227.18555-1-gay@disroot.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 74784 Cc: Homo 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: -1.0 (-) * gnu/packages/patches/hugs-fix-build.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/hugs.scm (hugs)[source]: Use it. [native-inputs]: Remove. Change-Id: I8b17f6c8a89fbc25ac9fe40b58962c83b08cbc21 --- Hi, The patch itself is taken from https://aur.archlinux.org/cgit/aur.git/tree/hsbase_inline.patch?h=hugs so for a while I was puzzled what to write when I don't understand C code. etc/committer.scm doesn't work with these changes, either it backtraces or says "Nothing to do." so instead I had to write manually, hopefully I didn't misunderstand what to write. gnu/local.mk | 1 + gnu/packages/hugs.scm | 7 +++---- gnu/packages/patches/hugs-fix-build.patch | 23 +++++++++++++++++++++++ 3 files changed, 27 insertions(+), 4 deletions(-) create mode 100644 gnu/packages/patches/hugs-fix-build.patch diff --git a/gnu/local.mk b/gnu/local.mk index 39b142af5a..c3ec582a0e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1556,6 +1556,7 @@ dist_patch_DATA = \ %D%/packages/patches/htslib-for-stringtie.patch \ %D%/packages/patches/hubbub-sort-entities.patch \ %D%/packages/patches/hueplusplus-mbedtls.patch \ + %D%/packages/patches/hugs-fix-build.patch \ %D%/packages/patches/hurd-64bit.patch \ %D%/packages/patches/hurd-refcounts-assert.patch \ %D%/packages/patches/hurd-rumpdisk-no-hd.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..997baacc86 --- /dev/null +++ b/gnu/packages/patches/hugs-fix-build.patch @@ -0,0 +1,23 @@ +Fixes build with GCC 5 and later. + +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 From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 23 14:41:00 2024 Received: (at 74784-done) by debbugs.gnu.org; 23 Dec 2024 19:41:00 +0000 Received: from localhost ([127.0.0.1]:58092 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tPoIV-0008AM-St for submit@debbugs.gnu.org; Mon, 23 Dec 2024 14:41:00 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41644) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tPoIR-0008A3-MJ for 74784-done@debbugs.gnu.org; Mon, 23 Dec 2024 14:40:59 -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 1tPoIL-0004IB-W1; Mon, 23 Dec 2024 14:40:50 -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=R1CXWdOcrV4q1s3W0V9XfVxfXjAyg2EIfSjKJX/Albc=; b=Rq4RGlrHF8vpsJQOfnAS 9QghxNeYdkq0MnZYzEsrcyIngV3kuaANwe3fUDOMQGSMIXUxj7pOWWGCKnqIhxHEIS5YH56BWEh2D 1OWcVaA9NpCB+Esa/+UYDWHirztajF2R/aXdy0NQiosrpRKx1ZFHmT1G33pHP6DtMy09f/4OBLfKJ U5tSixPmmDEkEeWhZnHTDHZ/MQxGr+6mFrTDoXrrWiMIkRGD9z0jYtOP9YtjbRtBIQSqOf5PyFMIf jX2YtumeEcVcbur++PQy/wzKOYimN5eLRtHOkpN/1zXQ4NiGY/13dn0gR4jpJp0Gk+VuVdMCqFU5T nMgCZarbmTOgkw==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Homo Subject: Re: [bug#74784] [PATCH v2] gnu: hugs: Fix build with GCC. In-Reply-To: <20241216085227.18555-1-gay@disroot.org> (Homo's message of "Mon, 16 Dec 2024 10:47:32 +0200") References: <20241211102636.20121-1-gay@disroot.org> <20241216085227.18555-1-gay@disroot.org> Date: Mon, 23 Dec 2024 20:40:31 +0100 Message-ID: <8734ie6vdc.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 74784-done Cc: 74784-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 (---) Homo skribis: > * gnu/packages/patches/hugs-fix-build.patch: New file. > * gnu/local.mk (dist_patch_DATA): Register it. > * gnu/packages/hugs.scm (hugs)[source]: Use it. > [native-inputs]: Remove. > > Change-Id: I8b17f6c8a89fbc25ac9fe40b58962c83b08cbc21 > --- > Hi, > > The patch itself is taken from https://aur.archlinux.org/cgit/aur.git/tre= e/hsbase_inline.patch?h=3Dhugs > so for a while I was puzzled what to write when I don't understand C code. I added this link to the top of the patch. > etc/committer.scm doesn't work with these changes, either it backtraces o= r says "Nothing to do." > so instead I had to write manually, hopefully I didn't misunderstand what= to write. Oh, too bad. It=E2=80=99s perfect anyway! Applied, thanks! Ludo=E2=80=99. From unknown Fri Jun 20 07:18:01 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Tue, 21 Jan 2025 12:24:23 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator