diff options
| author |   Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-12-20 15:34:47 +0000 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-12-20 15:34:47 +0000 |
| commit | c8398f16cfa70661175d20fe5a512f09f38e5353 (patch) | |
| tree | c912c8880baa8f82d55eee133002b92ff38dda32 /dev-db | |
| parent | Clean up old version (diff) | |
| download | gentoo-2-c8398f16cfa70661175d20fe5a512f09f38e5353.tar.gz gentoo-2-c8398f16cfa70661175d20fe5a512f09f38e5353.tar.bz2 gentoo-2-c8398f16cfa70661175d20fe5a512f09f38e5353.zip | |
Fix building with USE="icu -tcl -test" (bug #297534).
(Portage version: 15121-svn/cvs/Linux x86_64)
Diffstat (limited to 'dev-db')
| -rw-r--r-- | dev-db/sqlite/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-db/sqlite/sqlite-3.6.21.ebuild | 10 |
2 files changed, 13 insertions, 3 deletions
diff --git a/dev-db/sqlite/ChangeLog b/dev-db/sqlite/ChangeLog index 4555b202f36c..7f1a9e004a09 100644 --- a/dev-db/sqlite/ChangeLog +++ b/dev-db/sqlite/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-db/sqlite # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.303 2009/12/20 14:40:42 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.304 2009/12/20 15:34:47 arfrever Exp $ + + 20 Dec 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> + sqlite-3.6.21.ebuild: + Fix building with USE="icu -tcl -test" (bug #297534). 20 Dec 2009; Brent Baude <ranger@gentoo.org> sqlite-3.6.20-r1.ebuild: Marking sqlite-3.6.20-r1 ppc64 for bug 297532 diff --git a/dev-db/sqlite/sqlite-3.6.21.ebuild b/dev-db/sqlite/sqlite-3.6.21.ebuild index efd1e1c834aa..bfce1839bd47 100644 --- a/dev-db/sqlite/sqlite-3.6.21.ebuild +++ b/dev-db/sqlite/sqlite-3.6.21.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.6.21.ebuild,v 1.4 2009/12/19 12:05:13 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.6.21.ebuild,v 1.5 2009/12/20 15:34:47 arfrever Exp $ EAPI="2" @@ -48,7 +48,13 @@ src_configure() { if use icu; then append-cppflags -DSQLITE_ENABLE_ICU - sed -e "s/TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed" + if use tcl || use test; then + # Normal tarball. + sed -e "s/TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed" + else + # Amalgamation tarball. + sed -e "s/LIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed" + fi fi # Support soundex, bug #143794 |