diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2013-03-10 21:18:17 +0000 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2013-03-10 21:18:17 +0000 |
| commit | e74692f90358bcaae1087ca3c36f70e13d6a1c9b (patch) | |
| tree | d44ed3148558679fdcc0774e8d073c77de54cbbe /app-accessibility/flite | |
| parent | Remove myself as co-maintainer (diff) | |
| download | gentoo-2-e74692f90358bcaae1087ca3c36f70e13d6a1c9b.tar.gz gentoo-2-e74692f90358bcaae1087ca3c36f70e13d6a1c9b.tar.bz2 gentoo-2-e74692f90358bcaae1087ca3c36f70e13d6a1c9b.zip | |
Fixed linking of shared libraries (bug #339923)
(Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)
Diffstat (limited to 'app-accessibility/flite')
| -rw-r--r-- | app-accessibility/flite/ChangeLog | 11 | ||||
| -rw-r--r-- | app-accessibility/flite/files/flite-1.4-ldflags.patch | 25 | ||||
| -rw-r--r-- | app-accessibility/flite/flite-1.4-r2.ebuild (renamed from app-accessibility/flite/flite-1.4-r1.ebuild) | 4 |
3 files changed, 35 insertions, 5 deletions
diff --git a/app-accessibility/flite/ChangeLog b/app-accessibility/flite/ChangeLog index c12f7adc653d..8666611ac81f 100644 --- a/app-accessibility/flite/ChangeLog +++ b/app-accessibility/flite/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-accessibility/flite -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-accessibility/flite/ChangeLog,v 1.43 2012/12/28 18:44:22 ulm Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-accessibility/flite/ChangeLog,v 1.44 2013/03/10 21:18:17 polynomial-c Exp $ + +*flite-1.4-r2 (10 Mar 2013) + + 10 Mar 2013; Lars Wendler <polynomial-c@gentoo.org> -flite-1.4-r1.ebuild, + +flite-1.4-r2.ebuild, files/flite-1.4-ldflags.patch: + Non-maintainer commit: Fixed linking of shared libraries. Thanks to Andrew + John Hughes for providing a patch in bug #339923. 28 Dec 2012; Ulrich Müller <ulm@gentoo.org> flite-1.2-r1.ebuild, flite-1.3.ebuild, flite-1.4-r1.ebuild: diff --git a/app-accessibility/flite/files/flite-1.4-ldflags.patch b/app-accessibility/flite/files/flite-1.4-ldflags.patch index f805f57508c1..f9295fb853b7 100644 --- a/app-accessibility/flite/files/flite-1.4-ldflags.patch +++ b/app-accessibility/flite/files/flite-1.4-ldflags.patch @@ -1,12 +1,35 @@ diff -Naur flite-1.4-release/config/common_make_rules flite-1.4-release.new/config/common_make_rules --- flite-1.4-release/config/common_make_rules 2009-07-30 14:52:56.000000000 +0000 +++ flite-1.4-release.new/config/common_make_rules 2011-03-26 20:22:59.000000000 +0000 +@@ -68,7 +68,7 @@ + + FLITELIBS = $(BUILDDIR)/lib/libflite.a + FLITELIBFLAGS = -L$(BUILDDIR)/lib -lflite +-LDFLAGS += -lm $(AUDIOLIBS) $(OTHERLIBS) ++LDLIBS += -lm $(AUDIOLIBS) $(OTHERLIBS) + + FULLOBJS = $(OBJS:%=$(OBJDIR)/%) + ifdef SHFLAGS @@ -123,7 +123,7 @@ @ rm -rf shared_os && mkdir shared_os @ rm -f $@ $@.${PROJECT_VERSION} $@.${PROJECT_SHLIB_VERSION} @ (cd shared_os && ar x ../$<) - @ (cd shared_os && $(CC) -shared -Wl,-soname,`basename $@`.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os) -+ @ (cd shared_os && $(CC) $(LDFLAGS) -shared -Wl,-soname,`basename $@`.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os) ++ @ (cd shared_os && $(CC) ${LDFLAGS} -shared -Wl,-soname,`basename $@`.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os $(LDLIBS)) @ (cd $(LIBDIR) && ln -s `basename $@.${PROJECT_VERSION}` `basename $@.${PROJECT_SHLIB_VERSION}` ) @ (cd $(LIBDIR) && ln -s `basename $@.${PROJECT_SHLIB_VERSION}` `basename $@` ) @ rm -rf shared_os +--- flite-1.4-release/tools/Makefile~ 2009-08-22 20:19:01.000000000 +0100 ++++ flite-1.4-release.new/tools/Makefile 2013-01-20 20:06:34.259527220 +0000 +@@ -62,9 +62,9 @@ + LOCAL_CLEAN = $(BINDIR)/find_sts $(BINDIR)/flite_sort + + $(BINDIR)/find_sts: find_sts_main.o $(FLITELIBS) +- $(CC) $(CFLAGS) -o $@ find_sts_main.o $(FLITELIBFLAGS) $(LDFLAGS) ++ $(CC) $(CFLAGS) ${LDFLAGS} -o $@ find_sts_main.o $(FLITELIBFLAGS) $(LDLIBS) + $(BINDIR)/flite_sort: flite_sort_main.o $(FLITELIBS) +- $(CC) $(CFLAGS) -o $@ flite_sort_main.o $(FLITELIBFLAGS) $(LDFLAGS) ++ $(CC) $(CFLAGS) ${LDFLAGS} -o $@ flite_sort_main.o $(FLITELIBFLAGS) $(LDLIBS) + makescripts: + @ cp -p $(SCRIPTS) $(TOP)/bin + diff --git a/app-accessibility/flite/flite-1.4-r1.ebuild b/app-accessibility/flite/flite-1.4-r2.ebuild index 5186cc13aa6e..796ca758eafa 100644 --- a/app-accessibility/flite/flite-1.4-r1.ebuild +++ b/app-accessibility/flite/flite-1.4-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-accessibility/flite/flite-1.4-r1.ebuild,v 1.6 2012/12/28 18:44:22 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-accessibility/flite/flite-1.4-r2.ebuild,v 1.1 2013/03/10 21:18:17 polynomial-c Exp $ EAPI=4 inherit autotools eutils |