unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Simon South <simon@simonsouth.net>
To: guix-patches@gnu.org, 68195@debbugs.gnu.org
Subject: bug#68195: [PATCH core-updates 1/1] gnu: flite: Fix build.
Date: Sat, 13 Jan 2024 10:10:00 -0500	[thread overview]
Message-ID: <01a83cb58c5a3e705670ad71887811b1115f19a1.1705157474.git.simon@simonsouth.net> (raw)
In-Reply-To: <cover.1705157474.git.simon@simonsouth.net>

* 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





      reply	other threads:[~2024-01-13 15:11 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <877ckssp6f.fsf@simonsouth.net>
2024-01-13 15:09 ` bug#68195: [PATCH core-updates 0/1] gnu: flite: Fix build Simon South
2024-01-13 15:10   ` Simon South [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=01a83cb58c5a3e705670ad71887811b1115f19a1.1705157474.git.simon@simonsouth.net \
    --to=simon@simonsouth.net \
    --cc=68195@debbugs.gnu.org \
    --cc=guix-patches@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).