Skip to content

Fix make parallel, and fix for C++17 #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lenzo-ka wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix make parallel, and fix for C++17 #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c39696b
Fix race conditions in make -jN
lenzo-ka Jan 8, 2026
dc66339
Update to work with C++17 but still back to C++11
lenzo-ka Jan 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,12 @@ system_dummy := $(shell $(MAKE) -C $(TOP)/config -f make_system.mak TOP=.. syste

include $(TOP)/config/common_make_rules

# Ensure proper build order for parallel make (fixes race conditions)
# bin depends on src (for executables) and examples (for text2wave script)
bin: src examples
# doc depends on src (for festival executable to generate documentation)
doc: src

default_voices:
./src/scripts/default_voices.sh

Expand Down
3 changes: 3 additions & 0 deletions src/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ ALL = .sub_directories

include $(TOP)/config/common_make_rules

# Ensure main waits for library directories to complete (fixes parallel make race condition)
main: arch modules

tags:
@ rm -f $(TOP)/FileList
@ $(MAKE) --no-print-directory file-list
Expand Down
2 changes: 1 addition & 1 deletion src/arch/festival/server.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ int festival_start_server(int port)
serv_addr.sin_port = htons(port);
serv_addr.sin_addr.s_addr = htonl(INADDR_ANY);

if (bind(fd, (struct sockaddr *)&serv_addr, sizeof(serv_addr)) != 0)
if (::bind(fd, (struct sockaddr *)&serv_addr, sizeof(serv_addr)) != 0)
{
cerr << "socket: bind failed" << endl;
festival_error();
Expand Down
3 changes: 2 additions & 1 deletion src/modules/clunits/acost.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
/* */
/*=======================================================================*/
#include <cstdlib>
#include <cmath>
#include "festival.h"
#include "clunits.h"

Expand Down Expand Up @@ -196,7 +197,7 @@ static void cumulate_ss_frames(EST_Track *a,EST_SuffStats *ss_frames)
for (j=0; j < a->num_channels(); j++)
{
p = a->a_no_check(i,j);
if (!finite(p))
if (!std::isfinite(p))
{
p = 1.0e5;
a->a_no_check(i,j) = p;
Expand Down
Loading