From 6b144eca90ce1cc16695eed27b6fef26a7477609 Mon Sep 17 00:00:00 2001 From: Flammie Date: Mon, 20 Oct 2008 14:37:44 +0000 Subject: Fix bug #242574, version bump and gcc-4.3 patch. git-svn-id: http://overlays.gentoo.org/svn/proj/science/overlay@1315 32389bae-6d03-0410-99cf-db05cde120eb --- sci-misc/openfst/ChangeLog | 8 +++ sci-misc/openfst/Manifest | 7 +- .../files/openfst-20080422_beta-gcc-4.3.patch | 83 ++++++++++++++++++++++ sci-misc/openfst/openfst-20080317_beta.ebuild | 58 --------------- sci-misc/openfst/openfst-20080422_beta.ebuild | 61 ++++++++++++++++ 5 files changed, 156 insertions(+), 61 deletions(-) create mode 100644 sci-misc/openfst/files/openfst-20080422_beta-gcc-4.3.patch delete mode 100644 sci-misc/openfst/openfst-20080317_beta.ebuild create mode 100644 sci-misc/openfst/openfst-20080422_beta.ebuild diff --git a/sci-misc/openfst/ChangeLog b/sci-misc/openfst/ChangeLog index 7da0934b0..87aefbb22 100644 --- a/sci-misc/openfst/ChangeLog +++ b/sci-misc/openfst/ChangeLog @@ -2,6 +2,14 @@ # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*openfst-20080422 (20 Oct 2008) + + 20 Oct 2008; Flammie Pirinen + +openfst-20080422_beta.ebuild, + +files/openfst-20080422_beta-gcc4.3.patch, + -openfst-20080317_beta.ebuild: + Fix bug #242574. Version bump. Patch for gcc-4.3. Cleanup. + *openfst-20080317 (22 Mar 2008) 22 Mar 2008; Flammie Pirinen , diff --git a/sci-misc/openfst/Manifest b/sci-misc/openfst/Manifest index 38a6dd0ac..cec588520 100644 --- a/sci-misc/openfst/Manifest +++ b/sci-misc/openfst/Manifest @@ -1,4 +1,5 @@ -DIST OpenFst-beta-20080317.tgz 156634 RMD160 6593054adef89b995d771a2004cd8889dd2ba138 SHA1 7ab637d2fa063f41ef3941ec968bea382e73f6d7 SHA256 07f56287ac8d605c9f38fc71960212c752b647e65a82189ef5526c74990357bc -EBUILD openfst-20080317_beta.ebuild 1127 RMD160 566f0d8cf329d4df2f332a3f11852110a8b35b81 SHA1 ca854a82a7e4646f97209b702dde932c7e5771b0 SHA256 d0a78cd76bfc0b00f3561f81968fc1c56356404c8ac2fcafa4d361619812afbf -MISC ChangeLog 244 RMD160 aca76f458d26482708efc2641219710c55db64d3 SHA1 4c164e96d6157d0e518cad53f621b2f5f879f432 SHA256 d2835711bdd9946cc694d7f5d2a97cc10d297972e55a016f7ba8690d025a99de +AUX openfst-20080422_beta-gcc-4.3.patch 2918 RMD160 0aeceeb049614182f2e83fa3a149ba5aa54cffaa SHA1 64bb951888f83a3ba9f780b4ec4dec46d9d20303 SHA256 8aab92d28f806074916d76245de4c46b15c9ac302a8417e4cb168aa8d755cb12 +DIST OpenFst-beta-20080422.tgz 156800 RMD160 480e4da360d3d854a85473a8f40f7d1a53ad6421 SHA1 3266501f9362a22e52982d940fa888cf699ae88b SHA256 9b07d6ceb1a88cd01f7e41b511cd71b2c56278ad924c5947b71e642bab0bfff2 +EBUILD openfst-20080422_beta.ebuild 1279 RMD160 c2b8f98642066bae459262ed6997e3441119a9fb SHA1 e204748bb06931ddc92d5eaa38a52f550da18665 SHA256 2ba750327cb706e523d5a3de49751fc1089eb8277192eef9b26e49e42dc4060a +MISC ChangeLog 503 RMD160 d4e3bda8c7fa5051018af8491dda74c11f1e9b43 SHA1 3340a9878dc3148f1c6f3e7e45df46f6130e04b8 SHA256 cc01dc80d5cba977362c82aaa37cad3806bdaa8a450defbd0bbb0ee269527b95 MISC metadata.xml 223 RMD160 754bf1189c9d51090f3e0439f6e7d6f603b93df0 SHA1 54348ca01c174e03ff3318b2a9da50d970db6695 SHA256 5c57a999484660ea4a3e55f9c526bb38097d5c1cb2356353133ec4d7e89f1f88 diff --git a/sci-misc/openfst/files/openfst-20080422_beta-gcc-4.3.patch b/sci-misc/openfst/files/openfst-20080422_beta-gcc-4.3.patch new file mode 100644 index 000000000..8eb3116d0 --- /dev/null +++ b/sci-misc/openfst/files/openfst-20080422_beta-gcc-4.3.patch @@ -0,0 +1,83 @@ +diff -Naur -Naur OpenFst/fst/bin/main.cc OpenFst-nu/fst/bin/main.cc +--- OpenFst/fst/bin/main.cc 2008-03-17 17:42:00.000000000 +0200 ++++ OpenFst-nu/fst/bin/main.cc 2008-10-20 16:30:36.000000000 +0300 +@@ -18,6 +18,8 @@ + // Classes and functions for registering and invoking Fst main + // functions that support multiple and extensible arc types. + ++#include ++#include + #include + + #include "fst/bin/main.h" +diff -Naur -Naur OpenFst/fst/bin/Makefile OpenFst-nu/fst/bin/Makefile +--- OpenFst/fst/bin/Makefile 2008-03-17 17:42:00.000000000 +0200 ++++ OpenFst-nu/fst/bin/Makefile 2008-10-20 16:31:12.000000000 +0300 +@@ -15,7 +15,7 @@ + FSTLIBMAIN=libfstmain.$(LIBTYPE) + LIBS=-lfstmain -lfst -lm -lpthread -ldl + CC=g++ +-OPT=-O2 ++OPT=-O2 -fPIC + CFLAGS=-I../.. $(OPT) -DFST_DL + LDLFLAGS=-Wl,-L$(LIBDIR),-L$(BINDIR) + LDRFLAGS=-Wl,-rpath,$(LIBDIR),-rpath,$(BINDIR) # empty on macosx +diff -Naur -Naur OpenFst/fst/lib/compat.h OpenFst-nu/fst/lib/compat.h +--- OpenFst/fst/lib/compat.h 2008-03-17 17:41:56.000000000 +0200 ++++ OpenFst-nu/fst/lib/compat.h 2008-10-20 16:25:49.000000000 +0300 +@@ -27,7 +27,7 @@ + #include + #include + #include +- ++#include + #include + #include + #include +diff -Naur -Naur OpenFst/fst/lib/Makefile OpenFst-nu/fst/lib/Makefile +--- OpenFst/fst/lib/Makefile 2008-03-17 17:41:56.000000000 +0200 ++++ OpenFst-nu/fst/lib/Makefile 2008-10-20 16:23:05.000000000 +0300 +@@ -2,7 +2,7 @@ + SRCS=fst.cc properties.cc symbol-table.cc compat.cc + OBJS=fst.o properties.o symbol-table.o compat.o + CC=g++ +-OPT=-O2 ++OPT=-fPIC -O2 + CFLAGS=$(OPT) -I../.. -DFST_DL + LIBTYPE=so # "dylib" on macosx + SOFLAGS=-shared # "-dynamiclib -flat_namespace -undefined suppress" on macosx +diff -Naur -Naur OpenFst/fst/lib/randgen.h OpenFst-nu/fst/lib/randgen.h +--- OpenFst/fst/lib/randgen.h 2008-03-17 17:41:56.000000000 +0200 ++++ OpenFst-nu/fst/lib/randgen.h 2008-10-20 16:44:33.000000000 +0300 +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + + #include "fst/lib/mutable-fst.h" + +diff -Naur -Naur OpenFst/fst/lib/symbol-table.cc OpenFst-nu/fst/lib/symbol-table.cc +--- OpenFst/fst/lib/symbol-table.cc 2008-03-17 17:41:56.000000000 +0200 ++++ OpenFst-nu/fst/lib/symbol-table.cc 2008-10-20 16:21:16.000000000 +0300 +@@ -17,6 +17,8 @@ + // \file + // Classes to provide symbol-to-integer and integer-to-symbol mappings. + ++#include ++ + #include "fst/lib/symbol-table.h" + #include "fst/lib/util.h" + +diff -Naur -Naur OpenFst/fst/lib/vector-fst.h OpenFst-nu/fst/lib/vector-fst.h +--- OpenFst/fst/lib/vector-fst.h 2008-03-17 17:41:56.000000000 +0200 ++++ OpenFst-nu/fst/lib/vector-fst.h 2008-10-20 16:21:25.000000000 +0300 +@@ -21,6 +21,8 @@ + #ifndef FST_LIB_VECTOR_FST_H__ + #define FST_LIB_VECTOR_FST_H__ + ++#include ++ + #include "fst/lib/mutable-fst.h" + #include "fst/lib/test-properties.h" + diff --git a/sci-misc/openfst/openfst-20080317_beta.ebuild b/sci-misc/openfst/openfst-20080317_beta.ebuild deleted file mode 100644 index faf5a92e6..000000000 --- a/sci-misc/openfst/openfst-20080317_beta.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit multilib - -MY_PN="OpenFst" -MY_P="${MY_PN}-beta-${PV/_beta/}" - -DESCRIPTION="Finite State Transducer tools by Google et al." -HOMEPAGE="http://www.openfst.org" -SRC_URI="http://128.122.80.210/~openfst/twiki/pub/FST/FstDownload/${MY_P}.tgz" - -LICENSE="Apache-2.0" - -SLOT="0" - -KEYWORDS="~x86" - -IUSE="" - -DEPEND="" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MY_PN}/fst" - -src_unpack() { - unpack ${A} - cd "${S}" - sed -i -e "s/OPT=.*/OPT=${CXXFLAGS}/g" bin/Makefile -} - -src_compile() { - emake all || die "emake failed" -} - -src_install() { - # bin dir has .o and stuff - # bins have insecure runpath’s - for f in $(find bin/ -executable ) ; do - dobin ${f} - done - dodir /usr/include/fst - dodir /usr/include/fst/lib - insinto /usr/include/fst/lib - doins lib/fst.h - dodir /usr/$(get_libdir) - insinto /usr/$(get_libdir) - doins lib/libfst.so - doins bin/libfstmain.so - cd "${WORKDIR}/${MY_PN}" - dodoc README -} - -src_test() { - einfo "make test can take a few hours on moderately modern systems" - make test || die "check failed" -} diff --git a/sci-misc/openfst/openfst-20080422_beta.ebuild b/sci-misc/openfst/openfst-20080422_beta.ebuild new file mode 100644 index 000000000..b43cb808a --- /dev/null +++ b/sci-misc/openfst/openfst-20080422_beta.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit eutils multilib + +MY_PN="OpenFst" +MY_P="${MY_PN}-beta-${PV/_beta/}" + +DESCRIPTION="Finite State Transducer tools by Google et al." +HOMEPAGE="http://www.openfst.org" +SRC_URI="http://cims.nyu.edu/~openfst/twiki/pub/FST/FstDownload/${MY_P}.tgz" + +LICENSE="Apache-2.0" + +SLOT="0" + +KEYWORDS="~amd64" + +IUSE="" + +DEPEND="" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/OpenFst/fst" + +src_unpack() { + unpack ${A} + epatch "${FILESDIR}/${P}-gcc-4.3.patch" || die "Patching failed" + cd "${S}" + sed -i -e "s/OPT=\(.*\)/OPT=-fPIC ${CXXFLAGS} \1/g" bin/Makefile + lib/Makefile +} + +src_compile() { + emake all || die "emake failed" +} + +src_install() { + # bin dir has .o and stuff + # bins have insecure runpath’s + for f in $(find bin/ -executable ) ; do + dobin ${f} + done + dodir /usr/include/fst + dodir /usr/include/fst/lib + insinto /usr/include/fst/lib + doins lib/{fst,arc,compat,properties,register,symbol-table,util}.h + dodir /usr/$(get_libdir) + insinto /usr/$(get_libdir) + doins lib/libfst.so + doins bin/libfstmain.so + cd "${WORKDIR}/${MY_PN}" + dodoc README +} + +src_test() { + einfo "make test can take a few hours on moderately modern systems" + make test || die "check failed" +} + -- cgit v1.2.3-18-g5258