summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2015-03-29 07:55:28 +0000
committerJeroen Roovers <jer@gentoo.org>2015-03-29 07:55:28 +0000
commit28c246bb91228927b0a5d689c90fb37e19e55ea3 (patch)
treeff2f772c2fe3569e08fa2e0dd62a1056f486fc07 /dev-libs
parentinitial commit (diff)
downloadgentoo-2-28c246bb91228927b0a5d689c90fb37e19e55ea3.tar.gz
gentoo-2-28c246bb91228927b0a5d689c90fb37e19e55ea3.tar.bz2
gentoo-2-28c246bb91228927b0a5d689c90fb37e19e55ea3.zip
Ensure src/libbson is never even prepared.
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'dev-libs')
-rw-r--r--dev-libs/mongo-c-driver/ChangeLog5
-rw-r--r--dev-libs/mongo-c-driver/mongo-c-driver-1.1.2-r1.ebuild5
2 files changed, 8 insertions, 2 deletions
diff --git a/dev-libs/mongo-c-driver/ChangeLog b/dev-libs/mongo-c-driver/ChangeLog
index 25a30b73c5a0..ae803958edae 100644
--- a/dev-libs/mongo-c-driver/ChangeLog
+++ b/dev-libs/mongo-c-driver/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-libs/mongo-c-driver
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/mongo-c-driver/ChangeLog,v 1.19 2015/03/23 09:02:26 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/mongo-c-driver/ChangeLog,v 1.20 2015/03/29 07:55:28 jer Exp $
+
+ 29 Mar 2015; Jeroen Roovers <jer@gentoo.org> mongo-c-driver-1.1.2-r1.ebuild:
+ Ensure src/libbson is never even prepared.
*mongo-c-driver-1.1.2-r1 (23 Mar 2015)
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.1.2-r1.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.1.2-r1.ebuild
index b1c4e0d55be4..5e682c31e4a4 100644
--- a/dev-libs/mongo-c-driver/mongo-c-driver-1.1.2-r1.ebuild
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.1.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/mongo-c-driver/mongo-c-driver-1.1.2-r1.ebuild,v 1.1 2015/03/23 09:02:26 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/mongo-c-driver/mongo-c-driver-1.1.2-r1.ebuild,v 1.2 2015/03/29 07:55:28 jer Exp $
EAPI=5
@@ -24,6 +24,9 @@ DEPEND="${RDEPEND}
DOCS=( NEWS README.rst TUTORIAL.md )
src_prepare() {
+ rm -r src/libbson || die
+ sed -i -e '/SUBDIRS/s:src/libbson::g' Makefile.am || die
+
# https://github.com/mongodb/mongo-c-driver/issues/54
sed -i -e "s/PTHREAD_LIBS/PTHREAD_CFLAGS/g" src/Makefile.am \
tests/Makefile.am || die