- updated for 2.1

Changed files:
    speech_tools-gcc42.patch -> 1.2
    speech_tools-gcc44.patch -> 1.2

diff --git a/speech_tools-gcc42.patch b/speech_tools-gcc42.patch
index 9fafdcf3c696070135df767bca376cf208db1155..d11cd86984810119d2e58a904cbf25b9afc75efb 100644 (file)
--- a/speech_tools-gcc42.patch
+++ b/speech_tools-gcc42.patch
@@ -1,15 +1,7 @@
---- speech_tools.orig/config/compilers/gcc_defaults.mak        2004-05-03 13:51:44.000000000 +0200
-+++ speech_tools/config/compilers/gcc_defaults.mak     2007-06-16 12:02:48.000000000 +0200
-@@ -73,12 +73,12 @@
- PROFILE_gprof_CXXFLAGS  = -pg
- PROFILE_gprof_LINKFLAGS = -pg
- 
--SHARED_CCFLAGS  = -fPIC -fno-shared-data
--SHARED_CXXFLAGS  = -fPIC -fno-shared-data
--SHARED_LINKFLAGS = -fno-shared-data
-+SHARED_CCFLAGS  = -fPIC
-+SHARED_CXXFLAGS  = -fPIC
-+SHARED_LINKFLAGS =
+--- speech_tools/config/compilers/gcc_defaults.mak~    2012-01-17 16:25:23.304846522 +0100
++++ speech_tools/config/compilers/gcc_defaults.mak     2012-01-17 16:27:30.357325642 +0100
+@@ -81,7 +81,7 @@
+ SHARED_LINKFLAGS = 
  
  ifndef GCC_MAKE_SHARED_LIB
 -    MAKE_SHARED_LIB = $(CXX) -shared -fno-shared-data -o XXX -Wl,-soname -Wl,YYY

diff --git a/speech_tools-gcc44.patch b/speech_tools-gcc44.patch
index 7aabb9b6b47b117d2d8339d2acad7571324086fc..bcfef59814fb4a4cc4a577ca099e688e1de77905 100644 (file)
--- a/speech_tools-gcc44.patch
+++ b/speech_tools-gcc44.patch
@@ -1,24 +1,3 @@
---- speech_tools/speech_class/EST_wave_io.cc   2010-01-03 16:57:14.396879270 +0100
-+++ speech_tools/speech_class/EST_wave_io.cc.orig      2006-01-12 16:37:51.000000000 +0100
-@@ -68,7 +68,7 @@
- 
- int nist_get_param_int(const char *hdr, const char *field, int def_val)
- {
--    char *p;
-+    const char *p;
-     int val;
- 
-     if (((p=strstr(hdr,field)) != NULL) &&
-@@ -84,7 +84,8 @@
- 
- char *nist_get_param_str(const char *hdr, const char *field, const char *def_val)
- {
--    char *p,*val;
-+    const char *p;
-+    char *val;
-     int size;
- 
-     if (((p=strstr(hdr,field)) != NULL) &&
 --- speech_tools/base_class/EST_TSimpleMatrix.cc~      2004-09-30 14:53:35.000000000 +0200
 +++ speech_tools/base_class/EST_TSimpleMatrix.cc       2010-01-03 16:48:52.345905810 +0100
 @@ -44,6 +44,7 @@