rpms/festival/devel gcc43.patch,NONE,1.1 festival.spec,1.30,1.31

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/festival/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15477

Modified Files:
	festival.spec 
Added Files:
	gcc43.patch 
Log Message:
try again to fix the build with gcc43


gcc43.patch:

--- NEW FILE gcc43.patch ---
diff -up festival/src/modules/Text/text_modes.cc.gcc43 festival/src/modules/Text/text_modes.cc
--- festival/src/modules/Text/text_modes.cc.gcc43	2008-02-22 21:50:33.000000000 -0500
+++ festival/src/modules/Text/text_modes.cc	2008-02-22 21:50:41.000000000 -0500
@@ -59,8 +59,8 @@ static void um_apply_filter(const EST_St
 void tts_file_user_mode(LISP filename, LISP params)
 {
 
-    volatile EST_String tmpname = make_tmp_filename();
-    volatile EST_String inname = get_c_string(filename);
+    EST_String tmpname = make_tmp_filename();
+    EST_String inname = get_c_string(filename);
     volatile EST_String filter;
     volatile EST_TokenStream ts;
     volatile LISP func;
diff -up festival/speech_tools/base_class/EST_TSimpleVector.cc.gcc43 festival/speech_tools/base_class/EST_TSimpleVector.cc
--- festival/speech_tools/base_class/EST_TSimpleVector.cc.gcc43	2006-07-06 08:57:18.000000000 -0400
+++ festival/speech_tools/base_class/EST_TSimpleVector.cc	2008-02-22 21:43:03.000000000 -0500
@@ -43,6 +43,7 @@
 #include "EST_TSimpleVector.h"
 #include "EST_matrix_support.h"
 #include <fstream>
+#include <cstring>
 #include "EST_cutils.h"
 
 template<class T> void EST_TSimpleVector<T>::copy(const EST_TSimpleVector<T> &a)
diff -up festival/speech_tools/base_class/EST_TSimpleMatrix.cc.gcc43 festival/speech_tools/base_class/EST_TSimpleMatrix.cc
--- festival/speech_tools/base_class/EST_TSimpleMatrix.cc.gcc43	2004-09-30 08:53:35.000000000 -0400
+++ festival/speech_tools/base_class/EST_TSimpleMatrix.cc	2008-02-22 21:43:03.000000000 -0500
@@ -44,6 +44,7 @@
 #include "EST_TVector.h"
 #include <fstream>
 #include <iostream>
+#include <cstring>
 #include "EST_cutils.h"
 
 template<class T> 


Index: festival.spec
===================================================================
RCS file: /cvs/extras/rpms/festival/devel/festival.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- festival.spec	22 Feb 2008 18:48:28 -0000	1.30
+++ festival.spec	23 Feb 2008 03:03:56 -0000	1.31
@@ -126,8 +126,7 @@
 # in all of them.
 Patch92: festival-1.96-nitech-sltreferences.patch
 
-# -fno-shared-data has been obsolete since gcc 4.1
-Patch93: no-shared-data.patch
+Patch93: gcc43.patch
 
 BuildRequires: tetex
 BuildRequires: ncurses-devel, esound-devel
@@ -448,7 +447,7 @@
 %patch90 -p1 
 %patch91 -p1
 %patch92 -p1
-%patch93 -p1
+%patch93 -p1 -b .gcc43
 
 
 # zero length
@@ -464,15 +463,14 @@
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(pwd)/speech_tools/lib
 pushd speech_tools
   %configure
-  # -fno-shared-data is used 'cause the upstream makefile does.
   # -fPIC 'cause we're building shared libraries and it doesn't hurt
   # -fno-strict-aliasing because of a couple of warnings about code
   #   problems; if $RPM_OPT_FLAGS contains -O2 or above, this puts
   #   it back. Once that problem is gone upstream, remove this for
   #   better optimization.
   make \
-    CFLAGS="$RPM_OPT_FLAGS -fPIC -fno-shared-data -fno-strict-aliasing" \
-    CXXFLAGS="$RPM_OPT_FLAGS  -fPIC -fno-shared-data -fno-strict-aliasing"
+    CFLAGS="$RPM_OPT_FLAGS -fPIC -fno-strict-aliasing" \
+    CXXFLAGS="$RPM_OPT_FLAGS  -fPIC -fno-strict-aliasing"
 popd
 
 # build the main program
@@ -483,8 +481,8 @@
 %configure
 make \
   FTLIBDIR="%{_datadir}/festival/lib" \
-  CFLAGS="$RPM_OPT_FLAGS -fPIC -fno-shared-data" \
-  CXXFLAGS="$RPM_OPT_FLAGS -fPIC -fno-shared-data"
+  CFLAGS="$RPM_OPT_FLAGS -fPIC" \
+  CXXFLAGS="$RPM_OPT_FLAGS -fPIC"
 
 # build the patched CMU dictionary
 pushd lib/dicts/cmu