diff options
| author |   William Hubbs <williamh@gentoo.org> | 2007-08-31 04:12:37 +0000 |
|---|---|---|
| committer | William Hubbs <williamh@gentoo.org> | 2007-08-31 04:12:37 +0000 |
| commit | b6e4f103562fd885978a2bb005879ab6f1d046c9 (patch) | |
| tree | 47ad4689373d60e762b856f9ec40894370d0f674 /app-accessibility | |
| parent | mask =net-misc/drivel-2.0.2 and x11-plugins/desklet-sidecandyrhythmbox which ... (diff) | |
| download | gentoo-2-b6e4f103562fd885978a2bb005879ab6f1d046c9.tar.gz gentoo-2-b6e4f103562fd885978a2bb005879ab6f1d046c9.tar.bz2 gentoo-2-b6e4f103562fd885978a2bb005879ab6f1d046c9.zip | |
Fixed gcc4.2 compilation bug #190576.
(Portage version: 2.1.3.7)
Diffstat (limited to 'app-accessibility')
3 files changed, 72 insertions, 2 deletions
diff --git a/app-accessibility/speech-tools/ChangeLog b/app-accessibility/speech-tools/ChangeLog index c7b5cf287e61..201e63c3f316 100644 --- a/app-accessibility/speech-tools/ChangeLog +++ b/app-accessibility/speech-tools/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-accessibility/speech-tools # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/ChangeLog,v 1.50 2007/08/29 00:26:32 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/ChangeLog,v 1.51 2007/08/31 04:12:37 williamh Exp $ + + 31 Aug 2007; William Hubbs <williamh@gentoo.org> + +files/speech-tools-1.2.96_beta-gcc42.patch, + speech-tools-1.2.96_beta.ebuild: + Fixed gcc 4.2 compilation bug #190576. + Thanks to jhront@wanadoo.fr for the patch. 29 Aug 2007; William Hubbs <williamh@gentoo.org> speech-tools-1.2.96_beta.ebuild: diff --git a/app-accessibility/speech-tools/files/speech-tools-1.2.96_beta-gcc42.patch b/app-accessibility/speech-tools/files/speech-tools-1.2.96_beta-gcc42.patch new file mode 100644 index 000000000000..1810a96e6446 --- /dev/null +++ b/app-accessibility/speech-tools/files/speech-tools-1.2.96_beta-gcc42.patch @@ -0,0 +1,61 @@ +--- speech_tools/config/compilers/egcs.mak 2001-04-04 13:55:32.000000000 +0200 ++++ speech_tools/config/compilers/egcs.mak 2007-08-28 23:08:01.000000000 +0200 +@@ -54,7 +54,7 @@ + CXX=$(EGCS_CXX) + + ifndef EGCS_MAKE_SHARED_LIB +- MAKE_SHARED_LIB = gcc -shared -fno-shared-data -o XXX -Xlinker -h -Xlinker XXX ++ MAKE_SHARED_LIB = gcc -shared -o XXX -Xlinker -h -Xlinker XXX + else + MAKE_SHARED_LIB = $(GCC_MAKE_SHARED_LIB) + endif +--- speech_tools/config/compilers/gcc_defaults.mak 2006-08-05 17:37:59.000000000 +0200 ++++ speech_tools/config/compilers/gcc_defaults.mak 2007-08-28 23:08:30.000000000 +0200 +@@ -76,12 +76,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 = + + ifndef GCC_MAKE_SHARED_LIB +- MAKE_SHARED_LIB = $(CXX) -shared -fno-shared-data -o XXX ++ MAKE_SHARED_LIB = $(CXX) -shared -o XXX + else + MAKE_SHARED_LIB = $(GCC_MAKE_SHARED_LIB) + endif +--- speech_tools/doc/estjavaapp.sgml 2001-04-04 13:55:32.000000000 +0200 ++++ speech_tools/doc/estjavaapp.sgml 2007-08-28 23:08:43.000000000 +0200 +@@ -105,7 +105,7 @@ + &shellprompt; <userinput>cd tmpdir</userinput> + &shellprompt; <userinput>ar x ../libgcc.a</userinput> + &shellprompt; <userinput>cd ..</userinput> +- &shellprompt; <userinput>gcc -shared -fno-shared-data -o libgcc.so.2.7.2 tmpdir/*.o</userinput> ++ &shellprompt; <userinput>gcc -shared -o libgcc.so.2.7.2 tmpdir/*.o</userinput> + </screen> + </para> + </sect1> +--- speech_tools/stats/EST_DProbDist.cc 2004-09-30 14:53:36.000000000 +0200 ++++ speech_tools/stats/EST_DProbDist.cc 2007-08-28 23:21:17.000000000 +0200 +@@ -310,7 +310,7 @@ + if (type == tprob_discrete) + return 0; + else +- return (int)scounts.list.head(); ++ return (long)scounts.list.head(); + } + + int EST_DiscreteProbDistribution::item_end(int idx) const +@@ -326,7 +326,7 @@ + if (type == tprob_discrete) + return ++idx; + else +- return (int)next((EST_Litem *)idx); ++ return (long)next((EST_Litem *)idx); + } + + const EST_String &EST_DiscreteProbDistribution::item_name(int idx) const diff --git a/app-accessibility/speech-tools/speech-tools-1.2.96_beta.ebuild b/app-accessibility/speech-tools/speech-tools-1.2.96_beta.ebuild index 8e71c71f9c8c..ddca67c64f0e 100644 --- a/app-accessibility/speech-tools/speech-tools-1.2.96_beta.ebuild +++ b/app-accessibility/speech-tools/speech-tools-1.2.96_beta.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/speech-tools-1.2.96_beta.ebuild,v 1.3 2007/08/29 07:11:03 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/speech-tools-1.2.96_beta.ebuild,v 1.4 2007/08/31 04:12:37 williamh Exp $ inherit eutils toolchain-funcs @@ -28,6 +28,9 @@ src_unpack() { unpack ${A} + # apply a patch for gcc 4.2 + epatch ${FILESDIR}/${P}-gcc42.patch + # set compiler flags for base_class sed -i -e "s:-O3:\$(OPTIMISE_CXXFLAGS):" ${S}/base_class/Makefile |