diff options
| author |   Petteri Räty <betelgeuse@gentoo.org> | 2009-12-19 11:57:01 +0000 |
|---|---|---|
| committer | Petteri Räty <betelgeuse@gentoo.org> | 2009-12-19 11:57:01 +0000 |
| commit | fc8b24478b5649f5907ed37ace5e9ed6431648c5 (patch) | |
| tree | f7b31008e319e04d5f06402c789c8292ef176149 /dev-db | |
| parent | amd64 stable wrt #297010 (diff) | |
| download | gentoo-2-fc8b24478b5649f5907ed37ace5e9ed6431648c5.tar.gz gentoo-2-fc8b24478b5649f5907ed37ace5e9ed6431648c5.tar.bz2 gentoo-2-fc8b24478b5649f5907ed37ace5e9ed6431648c5.zip | |
Make building work without tcl installed using the amalgamation tarball from upstream. Fixes tests to work with -tcl. Thanks to Andrew <abrouwers@gmail.com>. Fixes bug #297113 and bug #297332.
(Portage version: 2.2_rc54/cvs/Linux i686)
Diffstat (limited to 'dev-db')
| -rw-r--r-- | dev-db/sqlite/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-db/sqlite/sqlite-3.6.21.ebuild | 28 |
2 files changed, 26 insertions, 9 deletions
diff --git a/dev-db/sqlite/ChangeLog b/dev-db/sqlite/ChangeLog index 0b32a5e6ab42..40a5179171b8 100644 --- a/dev-db/sqlite/ChangeLog +++ b/dev-db/sqlite/ChangeLog @@ -1,6 +1,11 @@ # 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.299 2009/12/12 21:09:39 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.300 2009/12/19 11:57:01 betelgeuse Exp $ + + 19 Dec 2009; Petteri Räty <betelgeuse@gentoo.org> sqlite-3.6.21.ebuild: + Make building work without tcl installed using the amalgamation tarball + from upstream. Fixes tests to work with -tcl. Thanks to Andrew + <abrouwers@gmail.com>. Fixes bug #297113 and bug #297332. 12 Dec 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> sqlite-3.6.21.ebuild: diff --git a/dev-db/sqlite/sqlite-3.6.21.ebuild b/dev-db/sqlite/sqlite-3.6.21.ebuild index 0729f8ce61f6..77459a339b8e 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.2 2009/12/12 20:47:55 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.6.21.ebuild,v 1.3 2009/12/19 11:57:01 betelgeuse Exp $ EAPI="2" @@ -10,19 +10,25 @@ DESCRIPTION="an SQL Database Engine in a C Library" HOMEPAGE="http://www.sqlite.org/" DOC_BASE="$(get_version_component_range 1-3)" DOC_PV="$(replace_all_version_separators _ ${DOC_BASE})" -SRC_URI="http://www.sqlite.org/${P}.tar.gz + +SRC_URI=" + tcl? ( http://www.sqlite.org/${P}.tar.gz ) + !tcl? ( + test? ( http://www.sqlite.org/${P}.tar.gz ) + !test? ( http://www.sqlite.org/${PN}-amalgamation-${PV}.tar.gz ) + ) doc? ( http://www.sqlite.org/${PN}_docs_${DOC_PV}.zip )" LICENSE="as-is" SLOT="3" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" -IUSE="debug doc fts3 icu +readline soundex tcl +threadsafe" +IUSE="debug doc fts3 icu +readline soundex tcl +threadsafe test" RDEPEND="icu? ( dev-libs/icu ) readline? ( sys-libs/readline ) - tcl? ( dev-lang/tcl )" + tcl? ( dev-lang/tcl ) + test? ( dev-lang/tcl )" DEPEND="${RDEPEND} - dev-lang/tcl doc? ( app-arch/unzip )" src_prepare() { @@ -55,12 +61,18 @@ src_configure() { append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS fi + # The amalgamation source doesn't have these via Makefile + if use debug; then + append-cppflags -DSQLITE_DEBUG=1 + else + append-cppflags -DNDEBUG + fi + + # amalgamation doesn't have tcl econf \ - $(use_enable debug) \ $(use_enable readline) \ $(use_enable threadsafe) \ - $(use_enable threadsafe cross-thread-connections) \ - $(use_enable tcl) + $(use tcl && echo --enable-tcl) } src_compile() { |