diff options
| author |   Thomas Raschbacher <lordvan@gentoo.org> | 2012-09-05 19:27:25 +0000 |
|---|---|---|
| committer | Thomas Raschbacher <lordvan@gentoo.org> | 2012-09-05 19:27:25 +0000 |
| commit | 857aca30434c908d82e6c41266014a5188e4d973 (patch) | |
| tree | 527b6506f62606366a349452939b72415ba85948 /dev-db/libzdb | |
| parent | Do not inherit versionator.eclass. Patch by Arfrever. (diff) | |
| download | gentoo-2-857aca30434c908d82e6c41266014a5188e4d973.tar.gz gentoo-2-857aca30434c908d82e6c41266014a5188e4d973.tar.bz2 gentoo-2-857aca30434c908d82e6c41266014a5188e4d973.zip | |
fix bug #251063
(Portage version: 2.1.11.12/cvs/Linux x86_64)
Diffstat (limited to 'dev-db/libzdb')
| -rw-r--r-- | dev-db/libzdb/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-db/libzdb/files/sqlite_configure.patch | 18 | ||||
| -rw-r--r-- | dev-db/libzdb/libzdb-2.10.3.ebuild | 8 |
3 files changed, 29 insertions, 3 deletions
diff --git a/dev-db/libzdb/ChangeLog b/dev-db/libzdb/ChangeLog index c6375342a1d8..67685a2c464f 100644 --- a/dev-db/libzdb/ChangeLog +++ b/dev-db/libzdb/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-db/libzdb # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/libzdb/ChangeLog,v 1.1 2012/09/05 19:08:19 lordvan Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/libzdb/ChangeLog,v 1.2 2012/09/05 19:27:25 lordvan Exp $ + + 05 Sep 2012; <lordvan@gentoo.org> libzdb-2.10.3.ebuild, + +files/sqlite_configure.patch: + added patch to configure script by Johan Bergström <bugs@bergstroem.nu> 05 Sep 2012; <lordvan@gentoo.org> libzdb-2.10.3.ebuild, metadata.xml: using parts from ebuild from bug #251063 by Johan Bergström diff --git a/dev-db/libzdb/files/sqlite_configure.patch b/dev-db/libzdb/files/sqlite_configure.patch new file mode 100644 index 000000000000..5ea7914091bb --- /dev/null +++ b/dev-db/libzdb/files/sqlite_configure.patch @@ -0,0 +1,18 @@ +--- configure.ac_orig 2012-07-14 07:14:19.000000000 +1000 ++++ configure.ac 2012-07-23 14:17:38.702411605 +1000 +@@ -298,12 +298,11 @@ + CPPFLAGS="-I$with_sqlite/include $CPPFLAGS" + AC_CHECK_HEADERS([sqlite3.h], [ + sqlite="yes" +- if test -r "$with_sqlite/lib/libsqlite3.a"; then ++ AC_CHECK_LIB(sqlite3, main,[ ++ + DBCPPFLAGS="$DBCPPFLAGS -I$with_sqlite/include" + DBLDFLAGS="$DBLDFLAGS -L$with_sqlite/lib/ -lsqlite3" +- else +- sqlite="no" +- fi ++ ],[sqlite="no"]) + ], [sqlite="no"]) + LDFLAGS=$svd_LDFLAGS + CPPFLAGS=$svd_CPPFLAGS diff --git a/dev-db/libzdb/libzdb-2.10.3.ebuild b/dev-db/libzdb/libzdb-2.10.3.ebuild index 6e2e80b3eae4..da8706bfe220 100644 --- a/dev-db/libzdb/libzdb-2.10.3.ebuild +++ b/dev-db/libzdb/libzdb-2.10.3.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/libzdb/libzdb-2.10.3.ebuild,v 1.1 2012/09/05 19:08:19 lordvan Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/libzdb/libzdb-2.10.3.ebuild,v 1.2 2012/09/05 19:27:25 lordvan Exp $ EAPI="4" -inherit eutils toolchain-funcs +inherit eutils toolchain-funcs autotools-utils DESCRIPTION="A thread safe high level multi-database connection pool library" HOMEPAGE="http://www.tildeslash.com/libzdb/" @@ -27,6 +27,10 @@ DEPEND="${RDEPEND} src_prepare() { sed -i -e "s|&& ./pool||g" test/Makefile.in || die + if ( use sqlite); then + epatch "$FILESDIR/sqlite_configure.patch" + fi + eautoreconf } src_configure() { |