diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2010-06-10 19:07:33 +0000 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2010-06-10 19:07:33 +0000 |
| commit | 90038fa61171622d3474d7e26a02c771946ab100 (patch) | |
| tree | c967f2644d4d9c204aa76b3d47c83a8bfd100be1 /dev-libs/Ice | |
| parent | Automated update of use.local.desc (diff) | |
| download | gentoo-2-90038fa61171622d3474d7e26a02c771946ab100.tar.gz gentoo-2-90038fa61171622d3474d7e26a02c771946ab100.tar.bz2 gentoo-2-90038fa61171622d3474d7e26a02c771946ab100.zip | |
non-maintainer commit: Fixing compilation against sys-libs/db:4.8 (see bug #312869)
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/Ice')
| -rw-r--r-- | dev-libs/Ice/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/Ice/Ice-3.4.0.ebuild | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/dev-libs/Ice/ChangeLog b/dev-libs/Ice/ChangeLog index 54eb33338cf8..12cb46fe9321 100644 --- a/dev-libs/Ice/ChangeLog +++ b/dev-libs/Ice/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/Ice # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/ChangeLog,v 1.2 2010/06/09 20:22:51 dev-zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/ChangeLog,v 1.3 2010/06/10 19:07:33 polynomial-c Exp $ + + 10 Jun 2010; Lars Wendler <polynomial-c@gentoo.org> Ice-3.4.0.ebuild: + non-maintainer commit: Fixing compilation against sys-libs/db:4.8 (see bug + #312869) *Ice-3.4.0 (09 Jun 2010) *Ice-3.3.1-r2 (09 Jun 2010) diff --git a/dev-libs/Ice/Ice-3.4.0.ebuild b/dev-libs/Ice/Ice-3.4.0.ebuild index 4e49862ff434..ffa07fe67958 100644 --- a/dev-libs/Ice/Ice-3.4.0.ebuild +++ b/dev-libs/Ice/Ice-3.4.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/Ice-3.4.0.ebuild,v 1.1 2010/06/09 20:22:51 dev-zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/Ice-3.4.0.ebuild,v 1.2 2010/06/10 19:07:33 polynomial-c Exp $ EAPI="2" @@ -94,13 +94,13 @@ src_configure() { use ncurses && OPTIONS="${MAKE_RULES} USE_READLINE=yes" || MAKE_RULES="${MAKE_RULES} USE_READLINE=no" use debug && OPTIONS"${MAKE_RULES} OPTIMIZE=no" || MAKE_RULES="${MAKE_RULES} OPTIMIZE=yes" - MAKE_RULES="${MAKE_RULES} DB_FLAGS=-I/usr/include/db4.6" + MAKE_RULES="${MAKE_RULES} DB_FLAGS=-I/usr/include/db4.8" sed -i \ -e "s|c++|$(tc-getCXX)|" \ -e "s|\(CFLAGS[[:space:]]*=\)|\1 ${CFLAGS}|" \ -e "s|\(CXXFLAGS[[:space:]]*=\)|\1 ${CXXFLAGS}|" \ -e "s|\(LDFLAGS[[:space:]]*=\)|\1 ${LDFLAGS}|" \ - -e "s|\(DB_LIBS[[:space:]]*=\) \-ldb_cxx|\1 -ldb_cxx-4.6|" \ + -e "s|\(DB_LIBS[[:space:]]*=\) \-ldb_cxx|\1 -ldb_cxx-4.8|" \ cpp/config/Make.rules{,.Linux} py/config/Make.rules || die "sed failed" if use python ; then |