ALT Linux repos
| S: | 2.5-alt0.4 |
| 5.0: | 1.96-alt6 |
| 4.1: | 1.96-alt5.M41.1 |
| 4.0: | 1.96-alt2.6 |
| 3.0: | |
| +backports: | 1.96-alt0.M30.1 |
Other repositories
| Upstream: | 1.96-beta |
Group :: Sound
RPM: festival
Navigation
Main Changelog Spec Patches Sources Download Gear Bugs and FR Repocop
Patch: speech-tools-2.5-debian_build-wo-liblink.diff
Download
Download
This patch provides most of the patches for speech-tools for Debian GNU/Linux,
to provide Debian specific building of speech-tools.
--- a/config/compilers/gcc_defaults.mak
+++ b/config/compilers/gcc_defaults.mak
@@ -39,7 +39,7 @@
###########################################################################
CC=gcc
-CXX=gcc
+CXX=g++
ifeq ($(OSTYPE),Darwin)
CXX=g++
endif
@@ -47,8 +47,9 @@
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) $(CPPFLAGS)
+CXXFLAGS += $(GCC_SYSTEM_OPTIONS) $(CC_OTHER_FLAGS) $(CPPFLAGS) $(OMP_OPTS) $(OMP_DEFS)
+LINKFLAGS += $(LDFLAGS)
DEBUG_CCFLAGS = -g
DEBUG_CXXFLAGS = -g
@@ -100,9 +101,10 @@
## 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
+STATIC_LINKFLAGS = -Dstatic
MAKE_DEPEND_C = $(CC) -MM $(INCLUDES) $(TEMPLATES) $(TEMPLATE_SPECIFIC)
MAKE_DEPEND_CXX = $(CC) -MM $(INCLUDES) $(TEMPLATES) $(TEMPLATE_SPECIFIC)
--- a/config/rules/bin_process.mak
+++ b/config/rules/bin_process.mak
@@ -59,6 +59,7 @@
Makefile ) : ;; \
VCLocalRules ) : ;; \
RCS|CVS ) : ;; \
+ SCCS|BitKeeper ) : ;; \
* ) $(ECHO_N) " $$i"; $(RM) -f "$$i";; \
esac \
done
--- a/config/rules/targets.mak
+++ b/config/rules/targets.mak
@@ -71,7 +71,7 @@
@ for i in $(ALL_DIRS) ; \
do \
echo "clean in $(DIRNAME)/$$i" ;\
- $(MAKE) --no-print-directory -C $$i clean ; \
+ $(MAKE) --no-print-directory -C $$i NO_DEPEND=1 clean ; \
done
endif
ifdef EXTRA_LIB_BUILD_DIRS
--- a/config/system.sh
+++ b/config/system.sh
@@ -60,8 +60,7 @@
sed -e 's/^\([^.]*\)\(\.[^-. ]*\).*/\1\2/'`
# Sort out various flavours of Linux
-if [ "$OSTYPE" = Linux ]
- then
+case "$OSTYPE" in Linux|GNU|GNU/*)
if [ -f "/etc/redhat-release" ]
then
OSTYPE=RedHatLinux
@@ -74,7 +73,8 @@
# Generic unknown GNU/Linux system.
OSTYPE=Linux
fi
-fi
+;;
+esac
# Make sure we actually have a .mak file for it, otherwise fall back
# to sensible defaults (for example, kernel version and architecture