head	1.2;
access;
symbols
	pkgsrc-2026Q1:1.2.0.54
	pkgsrc-2026Q1-base:1.2
	pkgsrc-2025Q4:1.2.0.52
	pkgsrc-2025Q4-base:1.2
	pkgsrc-2025Q3:1.2.0.50
	pkgsrc-2025Q3-base:1.2
	pkgsrc-2025Q2:1.2.0.48
	pkgsrc-2025Q2-base:1.2
	pkgsrc-2025Q1:1.2.0.46
	pkgsrc-2025Q1-base:1.2
	pkgsrc-2024Q4:1.2.0.44
	pkgsrc-2024Q4-base:1.2
	pkgsrc-2024Q3:1.2.0.42
	pkgsrc-2024Q3-base:1.2
	pkgsrc-2024Q2:1.2.0.40
	pkgsrc-2024Q2-base:1.2
	pkgsrc-2024Q1:1.2.0.38
	pkgsrc-2024Q1-base:1.2
	pkgsrc-2023Q4:1.2.0.36
	pkgsrc-2023Q4-base:1.2
	pkgsrc-2023Q3:1.2.0.34
	pkgsrc-2023Q3-base:1.2
	pkgsrc-2023Q2:1.2.0.32
	pkgsrc-2023Q2-base:1.2
	pkgsrc-2023Q1:1.2.0.30
	pkgsrc-2023Q1-base:1.2
	pkgsrc-2022Q4:1.2.0.28
	pkgsrc-2022Q4-base:1.2
	pkgsrc-2022Q3:1.2.0.26
	pkgsrc-2022Q3-base:1.2
	pkgsrc-2022Q2:1.2.0.24
	pkgsrc-2022Q2-base:1.2
	pkgsrc-2022Q1:1.2.0.22
	pkgsrc-2022Q1-base:1.2
	pkgsrc-2021Q4:1.2.0.20
	pkgsrc-2021Q4-base:1.2
	pkgsrc-2021Q3:1.2.0.18
	pkgsrc-2021Q3-base:1.2
	pkgsrc-2021Q2:1.2.0.16
	pkgsrc-2021Q2-base:1.2
	pkgsrc-2021Q1:1.2.0.14
	pkgsrc-2021Q1-base:1.2
	pkgsrc-2020Q4:1.2.0.12
	pkgsrc-2020Q4-base:1.2
	pkgsrc-2020Q3:1.2.0.10
	pkgsrc-2020Q3-base:1.2
	pkgsrc-2020Q2:1.2.0.8
	pkgsrc-2020Q2-base:1.2
	pkgsrc-2020Q1:1.2.0.4
	pkgsrc-2020Q1-base:1.2
	pkgsrc-2019Q4:1.2.0.6
	pkgsrc-2019Q4-base:1.2
	pkgsrc-2019Q3:1.2.0.2
	pkgsrc-2019Q3-base:1.2
	pkgsrc-2019Q2:1.1.0.52
	pkgsrc-2019Q2-base:1.1
	pkgsrc-2019Q1:1.1.0.50
	pkgsrc-2019Q1-base:1.1
	pkgsrc-2018Q4:1.1.0.48
	pkgsrc-2018Q4-base:1.1
	pkgsrc-2018Q3:1.1.0.46
	pkgsrc-2018Q3-base:1.1
	pkgsrc-2018Q2:1.1.0.44
	pkgsrc-2018Q2-base:1.1
	pkgsrc-2018Q1:1.1.0.42
	pkgsrc-2018Q1-base:1.1
	pkgsrc-2017Q4:1.1.0.40
	pkgsrc-2017Q4-base:1.1
	pkgsrc-2017Q3:1.1.0.38
	pkgsrc-2017Q3-base:1.1
	pkgsrc-2017Q2:1.1.0.34
	pkgsrc-2017Q2-base:1.1
	pkgsrc-2017Q1:1.1.0.32
	pkgsrc-2017Q1-base:1.1
	pkgsrc-2016Q4:1.1.0.30
	pkgsrc-2016Q4-base:1.1
	pkgsrc-2016Q3:1.1.0.28
	pkgsrc-2016Q3-base:1.1
	pkgsrc-2016Q2:1.1.0.26
	pkgsrc-2016Q2-base:1.1
	pkgsrc-2016Q1:1.1.0.24
	pkgsrc-2016Q1-base:1.1
	pkgsrc-2015Q4:1.1.0.22
	pkgsrc-2015Q4-base:1.1
	pkgsrc-2015Q3:1.1.0.20
	pkgsrc-2015Q3-base:1.1
	pkgsrc-2015Q2:1.1.0.18
	pkgsrc-2015Q2-base:1.1
	pkgsrc-2015Q1:1.1.0.16
	pkgsrc-2015Q1-base:1.1
	pkgsrc-2014Q4:1.1.0.14
	pkgsrc-2014Q4-base:1.1
	pkgsrc-2014Q3:1.1.0.12
	pkgsrc-2014Q3-base:1.1
	pkgsrc-2014Q2:1.1.0.10
	pkgsrc-2014Q2-base:1.1
	pkgsrc-2014Q1:1.1.0.8
	pkgsrc-2014Q1-base:1.1
	pkgsrc-2013Q4:1.1.0.6
	pkgsrc-2013Q4-base:1.1
	pkgsrc-2013Q3:1.1.0.4
	pkgsrc-2013Q3-base:1.1
	pkgsrc-2013Q2:1.1.0.2
	pkgsrc-2013Q2-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2019.09.07.13.00.48;	author nia;	state Exp;
branches;
next	1.1;
commitid	UTAvMsM5Hfao25CB;

1.1
date	2013.06.13.21.40.43;	author joerg;	state Exp;
branches;
next	;
commitid	BLIuNcchxeqQ6vTw;


desc
@@


1.2
log
@festival: Update to 2.5.0

New in Festival 2.5:

Support for gcc6 (which is a somewhat different dialect of C++)

New in Festival 2.2:

Updates to hts (hts_engine 1.07) and clustergen
@
text
@$NetBSD: patch-speech__tools_config_compilers_gcc__defaults.mak,v 1.1 2013/06/13 21:40:43 joerg Exp $

--- speech_tools/config/compilers/gcc_defaults.mak.orig	2017-09-04 15:54:03.000000000 +0000
+++ speech_tools/config/compilers/gcc_defaults.mak
@@@@ -38,17 +38,11 @@@@
  ##                                                                       ##
  ###########################################################################
 
-CC=gcc
-CXX=gcc
-ifeq ($(OSTYPE),Darwin)
-CXX=g++
-endif
-
 COMPILER_DESC=FSF gcc
 COMPILER_VERSION_COMMAND=$(CXX) -v 2>&1 | tail -1 | sed -e 's/^....//'
 
-CFLAGS  = $(GCC_SYSTEM_OPTIONS) $(CC_OTHER_FLAGS)
-CXXFLAGS  =  $(GCC_SYSTEM_OPTIONS) -fno-implicit-templates $(CC_OTHER_FLAGS) $(OMP_OPTS) $(OMP_DEFS)
+CFLAGS  += $(GCC_SYSTEM_OPTIONS) $(CC_OTHER_FLAGS)
+CXXFLAGS  +=  $(GCC_SYSTEM_OPTIONS) -fno-implicit-templates $(CC_OTHER_FLAGS) $(OMP_OPTS) $(OMP_DEFS)
 
 DEBUG_CCFLAGS   = -g
 DEBUG_CXXFLAGS  = -g
@@@@ -100,7 +94,7 @@@@ TEMPLATE_ARGS = 
 ## The -lgcc here is redundant - gcc does this anyway - but it
 ## helps java know what needs to be loaded.
 
-COMPILERLIBS= $(COMPILER_LIBS_DIR:%=-L%) -lstdc++ $(OMP_OPTS)
+COMPILERLIBS= $(COMPILER_LIBS_DIR:%=-L%) $(OMP_OPTS)
 
 ## special ways of doing things, blank means default
 
@


1.1
log
@Always link with G++ and don't hard-code libstdc++.
@
text
@d1 1
a1 1
$NetBSD$
d3 1
a3 1
--- speech_tools/config/compilers/gcc_defaults.mak.orig	2010-02-03 12:28:14.000000000 +0000
d5 2
a6 1
@@@@ -39,10 +39,7 @@@@
d9 1
a9 1
 CC=gcc
d12 1
a12 1
 CXX=g++
d14 1
a14 1
 
d17 9
a25 1
@@@@ -98,7 +95,7 @@@@ TEMPLATE_ARGS = 
d29 2
a30 2
-COMPILERLIBS= $(COMPILER_LIBS_DIR:%=-L%) -lstdc++ -lgcc
+COMPILERLIBS= $(COMPILER_LIBS_DIR:%=-L%)
@