diff options
| author | joerg <joerg@pkgsrc.org> | 2013-06-13 21:40:43 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2013-06-13 21:40:43 +0000 |
| commit | a92b798d127813f4aa8a6ab4ec01a6d781872fcf (patch) | |
| tree | 0f6f4005fde2e35466348ef50ce93573ed8ca625 /audio/festival | |
| parent | c81e02301896d7f1e7fd521a30feb88a1372e3c8 (diff) | |
| download | pkgsrc-a92b798d127813f4aa8a6ab4ec01a6d781872fcf.tar.gz | |
Always link with G++ and don't hard-code libstdc++.
Diffstat (limited to 'audio/festival')
| -rw-r--r-- | audio/festival/distinfo | 3 | ||||
| -rw-r--r-- | audio/festival/patches/patch-speech__tools_config_compilers_gcc__defaults.mak | 24 |
2 files changed, 26 insertions, 1 deletions
diff --git a/audio/festival/distinfo b/audio/festival/distinfo index cc3eb232e7b..0d290abe560 100644 --- a/audio/festival/distinfo +++ b/audio/festival/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.20 2013/04/29 21:12:36 joerg Exp $ +$NetBSD: distinfo,v 1.21 2013/06/13 21:40:43 joerg Exp $ SHA1 (festival-2.1-release.tar.gz) = f0c5a4282667898c584516e3605742835f59cb77 RMD160 (festival-2.1-release.tar.gz) = b3c646ecc532e4e05f846db06bbab12a13ec1d6b @@ -17,6 +17,7 @@ SHA1 (patch-speech__tools_base__class_EST__TVector.cc) = 0e205df1ac66bb747696c72 SHA1 (patch-speech__tools_base__class_inst__tmpl_vector__dmatrix__t.cc) = 5ee2d525df6a289b376bfa3375b8905d5752dad4 SHA1 (patch-speech__tools_base__class_inst__tmpl_vector__dvector__t.cc) = 8a2a4c1b1816c7be2479c0e0310cacfc9917c7ee SHA1 (patch-speech__tools_base__class_inst__tmpl_vector__fmatrix__t.cc) = 1d64a2e5aa1dc8c5b7d275e2bf66b2e96b599c35 +SHA1 (patch-speech__tools_config_compilers_gcc__defaults.mak) = 7441f2e424046dd50c1531160a5b5f94b8506e9d SHA1 (patch-speech__tools_config_rules_compile__options.mak) = d3aa93029edba84f8130f1bc33c8d74219bafd9a SHA1 (patch-speech__tools_include_EST__SCFG.h) = d58bc030dec4d526a89719e32c3624c642f33f3e SHA1 (patch-speech__tools_include_EST__TIterator.h) = db7617f5c4a802672ce3b098ecd512b6cdb96aeb diff --git a/audio/festival/patches/patch-speech__tools_config_compilers_gcc__defaults.mak b/audio/festival/patches/patch-speech__tools_config_compilers_gcc__defaults.mak new file mode 100644 index 00000000000..e18ae6a05c8 --- /dev/null +++ b/audio/festival/patches/patch-speech__tools_config_compilers_gcc__defaults.mak @@ -0,0 +1,24 @@ +$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 + |