From patchwork Sun Jun 11 11:13:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: gemmaro X-Patchwork-Id: 50835 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 4F99727BBE9; Sun, 11 Jun 2023 12:17:23 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 C705627BBE2 for ; Sun, 11 Jun 2023 12:17:21 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q8J4H-0008U8-CO; Sun, 11 Jun 2023 07:17:09 -0400 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 1q8J4E-0008Tl-7L for guix-patches@gnu.org; Sun, 11 Jun 2023 07:17:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q8J4D-00009X-RI for guix-patches@gnu.org; Sun, 11 Jun 2023 07:17:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q8J4A-0005Sz-CT; Sun, 11 Jun 2023 07:17:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63206] [PATCH v3] gnu: gnushogi: Fix build. References: <483665ed2ac988be7e19c67fe28b9f9e5acf2a9e.1682952374.git.gemmaro.dev@gmail.com> In-Reply-To: <483665ed2ac988be7e19c67fe28b9f9e5acf2a9e.1682952374.git.gemmaro.dev@gmail.com> Resent-From: gemmaro Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Sun, 11 Jun 2023 11:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63206 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63206@debbugs.gnu.org Cc: gemmaro , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 63206-submit@debbugs.gnu.org id=B63206.168648217220949 (code B ref 63206); Sun, 11 Jun 2023 11:17:02 +0000 Received: (at 63206) by debbugs.gnu.org; 11 Jun 2023 11:16:12 +0000 Received: from localhost ([127.0.0.1]:36776 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q8J36-0005R2-Ut for submit@debbugs.gnu.org; Sun, 11 Jun 2023 07:16:12 -0400 Received: from mail-pf1-f175.google.com ([209.85.210.175]:48307) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q8J32-0005Qm-PW for 63206@debbugs.gnu.org; Sun, 11 Jun 2023 07:15:54 -0400 Received: by mail-pf1-f175.google.com with SMTP id d2e1a72fcca58-651f2f38634so3524944b3a.0 for <63206@debbugs.gnu.org>; Sun, 11 Jun 2023 04:15:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686482147; x=1689074147; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=WbGx0bUxwzdsGGInlr2AOnziLv2acIWOHmCbeVR8PKo=; b=lRMwtr/axxyKxuxOT1VYqBxRDErIp5Guupxx+4qHv2yYyGcUDTCGdGzZm/RaCLrYs+ Vo8Y3CsSg4cx0pUz2CflB6OYwCyHZBZrX64bC5QgcIEijb4jfT8adb3YuAzqE6B/m8mZ p+MivjP/R84Df/PIohDzpsHe0diu1V0+eACpe77m/2v/Yuv7Q+p2nhm5S/GqriwIx6EX ye4QE4mgKrGijcUmxN64WdQDlZgQ82Bu/Ylk2jM195Z1nxlI1nxAoC/9bpBapNUiCvlH g6PBEILrN4XqoKb+WzeA8dF4iK29IHRrFwn5uiejVizFi1+LEfzjWqiB0eR2bWEstsgv W8sg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686482147; x=1689074147; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=WbGx0bUxwzdsGGInlr2AOnziLv2acIWOHmCbeVR8PKo=; b=O3kyBVk+pg84yAZJAA0kyX2Pgn48GScWCUzHiwFRl9RG6u/UvRUdAam4KFwecAWqfH qUMIhCe18wtmeKKdHwJUjBqIhS4lHRm9rq7pq1RJTG4zPmeu5lkEJ2soazPIktHENjqO 3fnXYKoLMjs17VCkAz2qOOX5Vm1t+FaQ+KPTvoQtPg4c6kapTq4grWtIEL0/AEDjwucH M1yrbpiu+TlVHSUgDjhve54evwdOvvRDx0dc2Uy0tVS5VZIvhL0GjP92DMbeTBcIT2DA JSQW7WO8hD2qgOHzj7xxV2sq0Xngg8FCOykwWmuc74cTBMyf0eDcMbs/hkcvzYgTnukI LvtA== X-Gm-Message-State: AC+VfDyLbz7A+mrFHvTLK9ca3vNREIqvmR7/O1+q6Bv+XY43BgxfKlgx aC5XwvZ5t8WpVF+L8B7HS71I0XKdPZGyXg== X-Google-Smtp-Source: ACHHUZ4Vd2/kmAWgQP+CQ/1QNTdKqeyJZG4JjSQklGdhpB2SdqKFNMYMU7cVQIjsxFHBay6SS1k/Bg== X-Received: by 2002:a05:6a00:2281:b0:64c:a554:f577 with SMTP id f1-20020a056a00228100b0064ca554f577mr8486639pfe.11.1686482146677; Sun, 11 Jun 2023 04:15:46 -0700 (PDT) Received: from mac.gemmaro.name ([240f:74:d1f0:1:ba1:e787:c9e:b1dc]) by smtp.gmail.com with ESMTPSA id a23-20020a62bd17000000b0062d859a33d1sm5224046pff.84.2023.06.11.04.15.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Jun 2023 04:15:46 -0700 (PDT) From: gemmaro Date: Sun, 11 Jun 2023 20:13:33 +0900 Message-Id: <765feb5a519d82294ac2032b18c4ad22d9fd7c29.1686481609.git.gemmaro.dev@gmail.com> X-Mailer: git-send-email 2.40.1 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/games.scm (gnushogi) [source]: Fix warnings by prefixing "__FUNCTION__" with "__extension__". [arguments]: Turn off some GCC warnings in C flags. Set the linker flag to build the program. Skip the "--enable-fast-install" flag in the configure phase. Enable the "sizetest" test in the check phase. [synopsis]: Remove "The" so that the sentence doesn't start with it. --- Hello, Thank you for the review. I tried to use #:make-flags in the revision 2, and additionally dealt with warnings and enable check phase in this revision. Best, gemmaro. gnu/packages/games.scm | 51 ++++++++++++++++++++++++++++++++---------- 1 file changed, 39 insertions(+), 12 deletions(-) base-commit: 73fa2889895f35bcf0c41f1174413381fdd7ec2c diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 8c00c2e66ed..37c51873ab8 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -78,6 +78,7 @@ ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2023 Florian Pelz ;;; Copyright © 2023 Ivana Drazovic +;;; Copyright © 2023 gemmaro ;;; ;;; This file is part of GNU Guix. ;;; @@ -2043,20 +2044,46 @@ (define-public gnushogi (package (name "gnushogi") (version "1.4.2") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://gnu/gnushogi/gnushogi-" - version ".tar.gz")) - (sha256 - (base32 - "0a9bsl2nbnb138lq0h14jfc5xvz7hpb2bcsj4mjn6g1hcsl4ik0y")))) - (arguments `(#:tests? #f)) ;; No check target. + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/gnushogi/gnushogi-" version + ".tar.gz")) + (sha256 + (base32 + "0a9bsl2nbnb138lq0h14jfc5xvz7hpb2bcsj4mjn6g1hcsl4ik0y")) + (modules '((guix build utils))) + ;; Fix "warning: ISO C90 does not support ‘__func__’ predefined + ;; identifier [-Wpedantic]" + (snippet '(begin + (substitute* "gnushogi/dspwrappers.c" + (("__FUNCTION__") + "__extension__ __FUNCTION__")))))) + (arguments + `(#:configure-flags (list (string-append + "CFLAGS=" + (string-join '("-Wno-format" + "-Wno-unused-but-set-variable" + "-Wno-bool-compare") + " "))) + #:make-flags '("LDFLAGS=-z muldefs") + #:phases (modify-phases %standard-phases + ;; Skip --enable-fast-install flag + (replace 'configure + (lambda* (#:key outputs configure-flags #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (setenv "CONFIG_SHELL" + (which "sh")) + (setenv "SHELL" + (which "sh")) + (apply invoke "./configure" + (string-append "--prefix=" out) configure-flags))))) + #:test-target "sizetest")) (build-system gnu-build-system) (home-page "https://www.gnu.org/software/gnushogi/") - (synopsis "The game of Shogi (Japanese chess)") - (description "GNU Shogi is a program that plays the game Shogi (Japanese -Chess). It is similar to standard chess but this variant is far more complicated.") + (synopsis "Game of Shogi (Japanese chess)") + (description + "GNU Shogi is a program that plays the game Shogi (Japanese Chess). +It is similar to standard chess but this variant is far more complicated.") (license license:gpl3+))) (define-public ltris