diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2009-09-13 18:03:19 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2009-09-13 18:03:19 +0000 |
| commit | 87706f8e22bcc0d2e81fc8f4d6295697ef83ab5a (patch) | |
| tree | 02275072e399c31f0b692186b8c48c9929c5e4f6 /sys-libs/db | |
| parent | ia64 stable wrt #282232 (diff) | |
| download | historical-87706f8e22bcc0d2e81fc8f4d6295697ef83ab5a.tar.gz historical-87706f8e22bcc0d2e81fc8f4d6295697ef83ab5a.tar.bz2 historical-87706f8e22bcc0d2e81fc8f4d6295697ef83ab5a.zip | |
Bug #270851: with FEATURES=test USE=-tcl, we need to include Tcl anyway so that the testsuite works.
Package-Manager: portage-2.2_rc40/cvs/Linux x86_64
Diffstat (limited to 'sys-libs/db')
| -rw-r--r-- | sys-libs/db/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-libs/db/Manifest | 14 | ||||
| -rw-r--r-- | sys-libs/db/db-4.7.25_p4.ebuild | 15 |
3 files changed, 19 insertions, 16 deletions
diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog index 48121a629cbe..3f1d005f3459 100644 --- a/sys-libs/db/ChangeLog +++ b/sys-libs/db/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-libs/db # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.287 2009/07/30 11:01:33 pauldv Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.288 2009/09/13 18:03:19 robbat2 Exp $ + + 13 Sep 2009; Robin H. Johnson <robbat2@gentoo.org> db-4.7.25_p4.ebuild: + Bug #270851: with FEATURES=test USE=-tcl, we need to include Tcl anyway so + that the testsuite works. 29 Jul 2009; Paul de Vrieze <pauldv@gentoo.org> db-3.2.9-r11.ebuild, db-3.2.9_p2.ebuild, db-4.2.52_p4-r2.ebuild, db-4.2.52_p5.ebuild, diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest index 5679044afbe0..d94f216898d3 100644 --- a/sys-libs/db/Manifest +++ b/sys-libs/db/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX db-1.85-gentoo-paths.patch 684 RMD160 cbfb484127600e180eb432d3f5aa31deba43e8bf SHA1 42a105f2503315a28b1e7f7aad71ee3bd4a56a13 SHA256 049052c74c544ac1c1f3b1b91c3e43df76b135c610148212679dfd324470cf2f AUX db-3.2.9-fix-dep-link.patch 1005 RMD160 71f4c2255cc6afffc494341ecd6352a6c754c006 SHA1 437f0eb7c82c0a2b8e7c2cdadddbd889d2735a97 SHA256 57e6f13170db99ba7f2f43aa0c7606085d25094127c63a48b76333c1289f6382 AUX db-3.2.9-gcc43.patch 441 RMD160 90de42fc7b06e1f92f389b17d1af88da44b36b4d SHA1 7c42a4cba6cbd3ae75c306a5ed9090162f719c49 SHA256 102ac694f32719deabbefdcfbecd96a255b8a6cdc312095fb537cf99ca6b9d77 @@ -73,13 +70,6 @@ EBUILD db-4.5.20_p2-r1.ebuild 4909 RMD160 283e98a2244f00a6116929a5b991d125b05402 EBUILD db-4.5.20_p2.ebuild 3856 RMD160 18891b5909302bd17785a8ccfac724057da12822 SHA1 36dc963b96e1617e93cc284fcc1b8dc82ce1913c SHA256 d7814200a9278707edf8acdf114b6e85e51669ade804cceca6bb9d4b6ebe32e1 EBUILD db-4.6.21_p4.ebuild 4634 RMD160 d7cad2bbde25e881cb7609082840edc9ff9434b6 SHA1 7680706f03cd68608625647bcfada525d8daefdf SHA256 5116cfbe9661d5a1d87c4670e97aa8f6ac941a2a968b85bfdd6fc9b92b49e2ce EBUILD db-4.7.25_p3.ebuild 3969 RMD160 09ea8ff35bd50a1e13b5fbca45ee1321018a528f SHA1 3097b15d1807a684d20dc9c1fbd9b0f414b88ddd SHA256 7cffd88df1cdfb5108dd1b32b0ac986665b68538ee10fe00d85fce0840e5a5fb -EBUILD db-4.7.25_p4.ebuild 4023 RMD160 0d5e2d095d351a8bcfd15855c03effd63fb34dd5 SHA1 067e51a0dd98615236667e82ae3bc6d7bdb5e175 SHA256 8abdd7545a12fb220c3d36dd67b8e960991404d32d19923c48f71c58b4e296d2 -MISC ChangeLog 44788 RMD160 ed7600bb3857ca1bd13e4ef5896196c6917573f4 SHA1 3915d1a10ffed57c12ee4eb49b79232b4245b07d SHA256 91abc017fc4ba3631fe9e83ea42dac37c4b92c2a771d6e955705914248c07fcc +EBUILD db-4.7.25_p4.ebuild 4183 RMD160 eb4aac4b898d525a8fc275b5a203dc243929dd64 SHA1 9b1a3a11c1da6547c1f9d933c4f8bdaa616b3027 SHA256 7950331e0b8542b96e6967d77b41f710b7a485a3240d183a2c74c853e515a90e +MISC ChangeLog 44969 RMD160 6c94b3405cc040159fad40cba16f2de10913cb5b SHA1 248209be1954c9a53ea8bab99e9185a61dba9186 SHA256 4612eb557856ffc7eab267399a7a1ce162acbadd70978689a4f65e8ccee2f451 MISC metadata.xml 1657 RMD160 f474f2ae4512bb017c5f6d344d5d2d1b03dc6b47 SHA1 f24d5b8ab267859ddc9c1ddb0c10992d31809ec9 SHA256 cb82ec7afe1d3df3b38835aa74a6d467f5b31f98a783df9a01396a546acdf044 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.11 (GNU/Linux) - -iD8DBQFKcYFybKx5DBjWFdsRAjCAAJoCM/eF/RBS6VJ/epBwBFD/rTZtxgCfVYxk -OkfPgGUgNezOKqPnk5Bo9n8= -=lTcp ------END PGP SIGNATURE----- diff --git a/sys-libs/db/db-4.7.25_p4.ebuild b/sys-libs/db/db-4.7.25_p4.ebuild index 54dd7cbbccf1..8f5c23429bda 100644 --- a/sys-libs/db/db-4.7.25_p4.ebuild +++ b/sys-libs/db/db-4.7.25_p4.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/sys-libs/db/db-4.7.25_p4.ebuild,v 1.2 2009/07/05 19:52:54 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.7.25_p4.ebuild,v 1.3 2009/09/13 18:03:19 robbat2 Exp $ inherit eutils db flag-o-matic java-pkg-opt-2 autotools libtool @@ -77,6 +77,8 @@ src_unpack() { } src_compile() { + local myconf='' + # compilation with -O0 fails on amd64, see bug #171231 if use amd64; then replace-flags -O0 -O2 @@ -96,6 +98,14 @@ src_compile() { if use userland_GNU ; then append-ldflags -Wl,--default-symver fi + + # Bug #270851: test needs TCL support + if use tcl || use test ; then + myconf="${myconf} --enable-tcl" + myconf="${myconf} --with-tcl=/usr/$(get_libdir)" + else + myconf="${myconf} --disable-tcl" + fi cd "${S}" ECONF_SOURCE="${S}"/../dist \ @@ -109,8 +119,7 @@ src_compile() { $(use amd64 && echo --with-mutex=x86/gcc-assembly) \ $(use_enable !nocxx cxx) \ $(use_enable java) \ - $(use_enable tcl) \ - $(use tcl && echo --with-tcl=/usr/$(get_libdir)) \ + ${myconf} \ $(use_enable test) \ "$@" |