From patchwork Sat Jan 13 15:10:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon South X-Patchwork-Id: 58842 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 9CE3027BBEA; Sat, 13 Jan 2024 15:11:34 +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=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,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 19F3A27BBE2 for ; Sat, 13 Jan 2024 15:11:34 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rOff8-0003Rd-8t; Sat, 13 Jan 2024 10:11:06 -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 1rOff6-0003Qn-0N for guix-patches@gnu.org; Sat, 13 Jan 2024 10:11:04 -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 1rOff5-0006LA-OV for guix-patches@gnu.org; Sat, 13 Jan 2024 10:11:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rOff4-0001AQ-2P for guix-patches@gnu.org; Sat, 13 Jan 2024 10:11:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68426] [PATCH core-updates 1/1] gnu: flite: Fix build. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 13 Jan 2024 15:11:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 68426 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68426@debbugs.gnu.org, 68195@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org, 68195@debbugs.gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17051586374417 (code B ref -1); Sat, 13 Jan 2024 15:11:01 +0000 Received: (at submit) by debbugs.gnu.org; 13 Jan 2024 15:10:37 +0000 Received: from localhost ([127.0.0.1]:40816 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rOfee-00019B-NR for submit@debbugs.gnu.org; Sat, 13 Jan 2024 10:10:37 -0500 Received: from lists.gnu.org ([2001:470:142::17]:38540) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rOfec-00018v-L2 for submit@debbugs.gnu.org; Sat, 13 Jan 2024 10:10:35 -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 1rOfeX-0003LF-DN for guix-patches@gnu.org; Sat, 13 Jan 2024 10:10:29 -0500 Received: from mailout.easymail.ca ([64.68.200.34]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rOfeU-0005su-JI for guix-patches@gnu.org; Sat, 13 Jan 2024 10:10:29 -0500 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 9E331E5D3F; Sat, 13 Jan 2024 15:10:24 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo08-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo08-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 5OYh4A8WJOTN; Sat, 13 Jan 2024 15:10:24 +0000 (UTC) Received: from jupiter.smallsystems.net (23-233-96-210.cpe.pppoe.ca [23.233.96.210]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id 3A922E597C; Sat, 13 Jan 2024 15:10:24 +0000 (UTC) From: Simon South Date: Sat, 13 Jan 2024 10:10:00 -0500 Message-ID: <01a83cb58c5a3e705670ad71887811b1115f19a1.1705157474.git.simon@simonsouth.net> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=64.68.200.34; envelope-from=simon@simonsouth.net; helo=mailout.easymail.ca X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: , 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/flite-build-with-make-4.4.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/speech.scm (flite)[source]: Apply it. Change-Id: I263696c9571e2bcf97d5a4fc619124bce90d6799 --- gnu/local.mk | 1 + .../patches/flite-build-with-make-4.4.patch | 24 +++++++++++++++++++ gnu/packages/speech.scm | 3 ++- 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/flite-build-with-make-4.4.patch diff --git a/gnu/local.mk b/gnu/local.mk index c1833cd0dd..9b2957c9cb 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1185,6 +1185,7 @@ dist_patch_DATA = \ %D%/packages/patches/flann-cmake-3.11.patch \ %D%/packages/patches/flatpak-fix-path.patch \ %D%/packages/patches/flatpak-unset-gdk-pixbuf-for-sandbox.patch \ + %D%/packages/patches/flite-build-with-make-4.4.patch \ %D%/packages/patches/fluxbox-1.3.7-no-dynamic-cursor.patch \ %D%/packages/patches/fluxbox-1.3.7-gcc.patch \ %D%/packages/patches/fontconfig-cache-ignore-mtime.patch \ diff --git a/gnu/packages/patches/flite-build-with-make-4.4.patch b/gnu/packages/patches/flite-build-with-make-4.4.patch new file mode 100644 index 0000000000..d959bb73a5 --- /dev/null +++ b/gnu/packages/patches/flite-build-with-make-4.4.patch @@ -0,0 +1,24 @@ +Building flite with GNU Make 4.4 or newer fails with log messages like + + making in main ... + gcc -g -O2 -Wall -I../include -c -o flitevox_info_main.o flitevox_info_main.c + making ../build/aarch64-linux-gnu/lib/libflite.so + make[1]: *** No rule to make target 'flite_voice_list.c', needed by 'all'. Stop. + +This is due to a change in how the .NOTPARALLEL special make target is +interpreted. This patch causes the package to build as it did with earlier +versions of Make. + +diff --git a/main/Makefile b/main/Makefile +index 8166182..e5ba866 100644 +--- a/main/Makefile ++++ b/main/Makefile +@@ -104,7 +104,7 @@ else + shared_libs: nothing + endif + +-.NOTPARALLEL: $(ALL) ++.NOTPARALLEL: + + flite_lang_list: + rm -f flite_lang_list.c diff --git a/gnu/packages/speech.scm b/gnu/packages/speech.scm index 2ea8e4f64f..4009da9654 100644 --- a/gnu/packages/speech.scm +++ b/gnu/packages/speech.scm @@ -67,7 +67,8 @@ (define-public flite (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1n0p81jzndzc1rzgm66kw9ls189ricy5v1ps11y0p2fk1p56kbjf")))) + (base32 "1n0p81jzndzc1rzgm66kw9ls189ricy5v1ps11y0p2fk1p56kbjf")) + (patches (search-patches "flite-build-with-make-4.4.patch")))) (build-system gnu-build-system) (arguments ;; XXX: