speech_tools: Various improvements

- Fix gcc_syslibs dep on secondary architectures
- Remove -lstdc++ from linking commands
- Fix provide of devel package
- Make the devel package depend on devel:libncurses
- Install headers to speech_tools directory inside $includeDir
- Work around Festival's broken build system by symlinking configuration files
  and makefile rules
- Remove unneeded dependency on makefile_engine
This commit is contained in:
Timothy Gu
2014-12-27 12:51:28 -08:00
parent 8390c3785c
commit a776592824
2 changed files with 62 additions and 6 deletions

View File

@@ -2975,3 +2975,41 @@ index 71b271c..b7ac4a1 100644
--
1.8.3.4
From d1dec5aa5d0de6e3f83fcf1ad07b2486a5f62e63 Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Date: Fri, 26 Dec 2014 23:17:23 -0800
Subject: Remove -lstdc++ from linking command
diff --git a/config/compilers/gcc32.mak b/config/compilers/gcc32.mak
index 9703a3e..43fea62 100644
--- a/config/compilers/gcc32.mak
+++ b/config/compilers/gcc32.mak
@@ -56,7 +56,7 @@ STATIC_LINKFLAGS = -Dstatic
MAKE_DEPEND_C = $(CC) -MM $(INCLUDES) $(TEMPLATES) $(TEMPLATE_SPECIFIC)
MAKE_DEPEND_CXX = $(CC) -MM $(INCLUDES) $(WARN_CXXFLAGS) $(TEMPLATES) $(TEMPLATE_SPECIFIC)
-COMPILERLIBS= $(COMPILER_LIBS_DIR:%=-L%) -lstdc++
+COMPILERLIBS= $(COMPILER_LIBS_DIR:%=-L%)
diff --git a/config/compilers/gcc_defaults.mak b/config/compilers/gcc_defaults.mak
index befcd31..0be771d 100644
--- a/config/compilers/gcc_defaults.mak
+++ b/config/compilers/gcc_defaults.mak
@@ -96,10 +96,7 @@ STATIC_LINKFLAGS = -static
TEMPLATE_SPECIFIC = -DINSTANTIATE_TEMPLATES
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++
+COMPILERLIBS= $(COMPILER_LIBS_DIR:%=-L%)
## special ways of doing things, blank means default
--
1.8.3.4