Thu Jun 13 21:40:43 2013 UTC ()
Always link with G++ and don't hard-code libstdc++.


(joerg)
diff -r1.20 -r1.21 pkgsrc/audio/festival/distinfo
diff -r0 -r1.1 pkgsrc/audio/festival/patches/patch-speech__tools_config_compilers_gcc__defaults.mak
cvs diff -r1.20 -r1.21 pkgsrc/audio/festival/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/festival/distinfo 2013/04/29 21:12:36 1.20
+++ pkgsrc/audio/festival/distinfo 2013/06/13 21:40:43 1.21
@@ -1,28 +1,29 @@ @@ -1,28 +1,29 @@
1$NetBSD: distinfo,v 1.20 2013/04/29 21:12:36 joerg Exp $ 1$NetBSD: distinfo,v 1.21 2013/06/13 21:40:43 joerg Exp $
2 2
3SHA1 (festival-2.1-release.tar.gz) = f0c5a4282667898c584516e3605742835f59cb77 3SHA1 (festival-2.1-release.tar.gz) = f0c5a4282667898c584516e3605742835f59cb77
4RMD160 (festival-2.1-release.tar.gz) = b3c646ecc532e4e05f846db06bbab12a13ec1d6b 4RMD160 (festival-2.1-release.tar.gz) = b3c646ecc532e4e05f846db06bbab12a13ec1d6b
5Size (festival-2.1-release.tar.gz) = 787313 bytes 5Size (festival-2.1-release.tar.gz) = 787313 bytes
6SHA1 (speech_tools-2.1-release.tar.gz) = bbf43b259de8bb91e0c5e8a1defc6e45a10e60f9 6SHA1 (speech_tools-2.1-release.tar.gz) = bbf43b259de8bb91e0c5e8a1defc6e45a10e60f9
7RMD160 (speech_tools-2.1-release.tar.gz) = 59831fbe607f05308f339a3cfb3af53d7337328b 7RMD160 (speech_tools-2.1-release.tar.gz) = 59831fbe607f05308f339a3cfb3af53d7337328b
8Size (speech_tools-2.1-release.tar.gz) = 1681999 bytes 8Size (speech_tools-2.1-release.tar.gz) = 1681999 bytes
9SHA1 (patch-aa) = 053713a156c277fd47ff4e687b3623bf0061dd89 9SHA1 (patch-aa) = 053713a156c277fd47ff4e687b3623bf0061dd89
10SHA1 (patch-ab) = 7f22ea2a89caf72dcb18818eb98bdb54911d5e7c 10SHA1 (patch-ab) = 7f22ea2a89caf72dcb18818eb98bdb54911d5e7c
11SHA1 (patch-ac) = 9ffe5f44dc50d9ab5161b9ca107956e799fff463 11SHA1 (patch-ac) = 9ffe5f44dc50d9ab5161b9ca107956e799fff463
12SHA1 (patch-ae) = 9d630d198f829979508b90416ddb0f56d721b422 12SHA1 (patch-ae) = 9d630d198f829979508b90416ddb0f56d721b422
13SHA1 (patch-aq) = 81109b22e5db0f733fa2a3d8e7cdef1cdcbe0185 13SHA1 (patch-aq) = 81109b22e5db0f733fa2a3d8e7cdef1cdcbe0185
14SHA1 (patch-speech__tools_base__class_EST__TSimpleMatrix.cc) = e1ad503b0ea0f7c2e051cbc633dc343f5df5164f 14SHA1 (patch-speech__tools_base__class_EST__TSimpleMatrix.cc) = e1ad503b0ea0f7c2e051cbc633dc343f5df5164f
15SHA1 (patch-speech__tools_base__class_EST__TSimpleVector.cc) = 07acc5515d038733eeddd84ea6245e1fd0d2894a 15SHA1 (patch-speech__tools_base__class_EST__TSimpleVector.cc) = 07acc5515d038733eeddd84ea6245e1fd0d2894a
16SHA1 (patch-speech__tools_base__class_EST__TVector.cc) = 0e205df1ac66bb747696c72eee08db16ca58865f 16SHA1 (patch-speech__tools_base__class_EST__TVector.cc) = 0e205df1ac66bb747696c72eee08db16ca58865f
17SHA1 (patch-speech__tools_base__class_inst__tmpl_vector__dmatrix__t.cc) = 5ee2d525df6a289b376bfa3375b8905d5752dad4 17SHA1 (patch-speech__tools_base__class_inst__tmpl_vector__dmatrix__t.cc) = 5ee2d525df6a289b376bfa3375b8905d5752dad4
18SHA1 (patch-speech__tools_base__class_inst__tmpl_vector__dvector__t.cc) = 8a2a4c1b1816c7be2479c0e0310cacfc9917c7ee 18SHA1 (patch-speech__tools_base__class_inst__tmpl_vector__dvector__t.cc) = 8a2a4c1b1816c7be2479c0e0310cacfc9917c7ee
19SHA1 (patch-speech__tools_base__class_inst__tmpl_vector__fmatrix__t.cc) = 1d64a2e5aa1dc8c5b7d275e2bf66b2e96b599c35 19SHA1 (patch-speech__tools_base__class_inst__tmpl_vector__fmatrix__t.cc) = 1d64a2e5aa1dc8c5b7d275e2bf66b2e96b599c35
 20SHA1 (patch-speech__tools_config_compilers_gcc__defaults.mak) = 7441f2e424046dd50c1531160a5b5f94b8506e9d
20SHA1 (patch-speech__tools_config_rules_compile__options.mak) = d3aa93029edba84f8130f1bc33c8d74219bafd9a 21SHA1 (patch-speech__tools_config_rules_compile__options.mak) = d3aa93029edba84f8130f1bc33c8d74219bafd9a
21SHA1 (patch-speech__tools_include_EST__SCFG.h) = d58bc030dec4d526a89719e32c3624c642f33f3e 22SHA1 (patch-speech__tools_include_EST__SCFG.h) = d58bc030dec4d526a89719e32c3624c642f33f3e
22SHA1 (patch-speech__tools_include_EST__TIterator.h) = db7617f5c4a802672ce3b098ecd512b6cdb96aeb 23SHA1 (patch-speech__tools_include_EST__TIterator.h) = db7617f5c4a802672ce3b098ecd512b6cdb96aeb
23SHA1 (patch-speech__tools_include_EST__TNamedEnum.h) = f240a338d17d7a36a5dba1b0f3b48190b235bf03 24SHA1 (patch-speech__tools_include_EST__TNamedEnum.h) = f240a338d17d7a36a5dba1b0f3b48190b235bf03
24SHA1 (patch-speech__tools_include_EST__error.h) = 26c99948bee89f11b39efbb9d6eb195e1fb1602d 25SHA1 (patch-speech__tools_include_EST__error.h) = 26c99948bee89f11b39efbb9d6eb195e1fb1602d
25SHA1 (patch-speech__tools_include_ling__class_EST__FeatureFunctionPackage.h) = ec5eb54fba5a50b43d1a0c9f0a5ae36407f55bff 26SHA1 (patch-speech__tools_include_ling__class_EST__FeatureFunctionPackage.h) = ec5eb54fba5a50b43d1a0c9f0a5ae36407f55bff
26SHA1 (patch-speech__tools_include_unix_EST__socket__unix.h) = f81c0cda0858d121e2d24182f39c7ab8fc673174 27SHA1 (patch-speech__tools_include_unix_EST__socket__unix.h) = f81c0cda0858d121e2d24182f39c7ab8fc673174
27SHA1 (patch-speech__tools_stats_dynamic__program.cc) = d932f865d5c5577f7c1adc446adf9a2ab25c59c9 28SHA1 (patch-speech__tools_stats_dynamic__program.cc) = d932f865d5c5577f7c1adc446adf9a2ab25c59c9
28SHA1 (patch-speech__tools_utils_EST__ServiceTable.cc) = d085b9e1a925a12e80e0fc25884f4373ba271fd5 29SHA1 (patch-speech__tools_utils_EST__ServiceTable.cc) = d085b9e1a925a12e80e0fc25884f4373ba271fd5
File Added: pkgsrc/audio/festival/patches/patch-speech__tools_config_compilers_gcc__defaults.mak
$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	2010-02-03 12:28:14.000000000 +0000
+++ speech_tools/config/compilers/gcc_defaults.mak
@@ -39,10 +39,7 @@
  ###########################################################################
 
 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/^....//'
@@ -98,7 +95,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++ -lgcc
+COMPILERLIBS= $(COMPILER_LIBS_DIR:%=-L%)
 
 ## special ways of doing things, blank means default