From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id +HzYNByoomV+TQAAqHPOHw:P1 (envelope-from ) for ; Sat, 13 Jan 2024 16:11:25 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id +HzYNByoomV+TQAAqHPOHw (envelope-from ) for ; Sat, 13 Jan 2024 16:11:24 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1705158684; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: 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; bh=AevpoPxiZabAO69pFLtTvy5qt3eXDTo635P8mjhfWo0=; b=txf/2QJOXFoQKGNC/yF3OU/BQg4SDqWAS2WHlpzMrjLMk2yNwKhTXRybnr2W14P5Hb4zQR 22VsYzl0Z2mx7AlOHAQx/0z9G0vcVnV55og7EbWPBagbzm+7eLYbZSDfHSBwxTgLHm6nYU lifGC1Huf4wdnuTLGDdTlRUap09d8i5S/oinXl3O1tZhuuooa0C9cG4VN80v72HNh91uhB P1OH1Ri4rwcBMZQBbBv6dQGKhcK99EBW9UyqpQ3JjhjoDPJhw/hpZZpNLVMFcQkgLmfQCx cczwBOlfPRiZZU7CbO0DZHT1sAsjmLr73ktVwtmF3+S0LLHJ/Lx1s0ns+TcJXw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1705158684; a=rsa-sha256; cv=none; b=A9laQvqro7Yoax8qo6mutiRWFF5rKsVvllglupd4HvW7og+Z0nOsLnVcKSOzWNmkys9QSS bc0BKwaV0zzePRLBO533sgtwNhKczBwWHo2JA7qok7b5ocYkR3c9xaH6UJNRRutkrxGBqH i3QNls5DxOYz7fKyN/jwzgg7nryUT+RKdf+JNMZcki5bDGF2tU06DsbEllfq5od0XmT8fz XI+5u3To2LKLUJ94o7xVtgKtvZG45Y3gFhQ32ONnoc5Oa3rMv/kQhgojMRFwyW+y+Glpt6 3+t2Fph+osxbnxTsDefLcNDsSPczxIOfGkxkaG3a9i5T8YHWdjdwsmeRvUmReA== 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 A09A213A3F for ; Sat, 13 Jan 2024 16:11:24 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rOff9-0003SC-7P; Sat, 13 Jan 2024 10:11:07 -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-0003R4-N5 for bug-guix@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 1rOff6-0006Lz-E2 for bug-guix@gnu.org; Sat, 13 Jan 2024 10:11:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rOff5-0001Ak-12 for bug-guix@gnu.org; Sat, 13 Jan 2024 10:11:03 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#68195: [PATCH core-updates 1/1] gnu: flite: Fix build. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sat, 13 Jan 2024 15:11:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68195 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: guix-patches@gnu.org, 68195@debbugs.gnu.org Received: via spool by 68195-submit@debbugs.gnu.org id=B68195.17051586614478 (code B ref 68195); Sat, 13 Jan 2024 15:11:02 +0000 Received: (at 68195) by debbugs.gnu.org; 13 Jan 2024 15:11:01 +0000 Received: from localhost ([127.0.0.1]:40823 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rOff2-00019w-Ld for submit@debbugs.gnu.org; Sat, 13 Jan 2024 10:11:01 -0500 Received: from mailout.easymail.ca ([64.68.200.34]:41314) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rOff0-00019a-IH for 68195@debbugs.gnu.org; Sat, 13 Jan 2024 10:10:59 -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 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: bug-guix-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Queue-Id: A09A213A3F X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -3.51 X-Spam-Score: -3.51 X-TUID: w+VobOZ7Ntfa * 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: -- 2.41.0