* [gentoo-commits] repo/gentoo:master commit in: dev-libs/mongo-cxx-driver/files/, dev-libs/mongo-cxx-driver/
@ 2016-12-29 14:38 David Seifert
0 siblings, 0 replies; 2+ messages in thread
From: David Seifert @ 2016-12-29 14:38 UTC (permalink / raw
To: gentoo-commits
commit: 8a67edc44089837d2f95e6a7b2ab0a0bfdf38f1d
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 29 14:37:02 2016 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Dec 29 14:38:23 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a67edc4
dev-libs/mongo-cxx-driver: Fix building with more recent boost
Gentoo-bug: 598340
* Make PATCHES -p1 compliant
* Make multilib-strict compliant
* Misc QA fixes
Package-Manager: Portage-2.3.3, Repoman-2.3.1
.../files/mongo-cxx-driver-1.1.0-fix-scons.patch | 4 +-
.../files/mongo-cxx-driver-1.1.2-boost-ref.patch | 15 +++++
.../mongo-cxx-driver-1.1.2-r1.ebuild | 72 ++++++++++++++++++++++
.../mongo-cxx-driver/mongo-cxx-driver-1.1.2.ebuild | 70 ---------------------
4 files changed, 89 insertions(+), 72 deletions(-)
diff --git a/dev-libs/mongo-cxx-driver/files/mongo-cxx-driver-1.1.0-fix-scons.patch b/dev-libs/mongo-cxx-driver/files/mongo-cxx-driver-1.1.0-fix-scons.patch
index 89ec03b..2a8ce30 100644
--- a/dev-libs/mongo-cxx-driver/files/mongo-cxx-driver-1.1.0-fix-scons.patch
+++ b/dev-libs/mongo-cxx-driver/files/mongo-cxx-driver-1.1.0-fix-scons.patch
@@ -1,5 +1,5 @@
---- /tmp/a/SConstruct 2016-06-21 21:15:24.000000000 +0200
-+++ /tmp/b/SConstruct 2016-08-19 11:40:45.916695952 +0200
+--- a/SConstruct
++++ b/SConstruct
@@ -865,7 +865,6 @@
# -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used.
diff --git a/dev-libs/mongo-cxx-driver/files/mongo-cxx-driver-1.1.2-boost-ref.patch b/dev-libs/mongo-cxx-driver/files/mongo-cxx-driver-1.1.2-boost-ref.patch
new file mode 100644
index 00000000..9997dd5
--- /dev/null
+++ b/dev-libs/mongo-cxx-driver/files/mongo-cxx-driver-1.1.2-boost-ref.patch
@@ -0,0 +1,15 @@
+Fix missing implicit include.
+Patch by Jan-Matthias Braun
+See also: https://bugs.gentoo.org/show_bug.cgi?id=598340
+
+--- a/src/mongo/client/examples/connect.cpp
++++ b/src/mongo/client/examples/connect.cpp
+@@ -29,6 +29,8 @@
+ #include "mongo/client/dbclient.h"
+ #include "mongo/stdx/functional.h"
+
++#include <boost/core/ref.hpp>
++
+ namespace {
+
+ class OstreamAppender : public mongo::logger::MessageLogDomain::EventAppender {
diff --git a/dev-libs/mongo-cxx-driver/mongo-cxx-driver-1.1.2-r1.ebuild b/dev-libs/mongo-cxx-driver/mongo-cxx-driver-1.1.2-r1.ebuild
new file mode 100644
index 00000000..eff4802
--- /dev/null
+++ b/dev-libs/mongo-cxx-driver/mongo-cxx-driver-1.1.2-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+SCONS_MIN_VERSION=2.3.0
+
+inherit scons-utils toolchain-funcs
+
+DESCRIPTION="C++ Driver for MongoDB"
+HOMEPAGE="https://github.com/mongodb/mongo-cxx-driver"
+SRC_URI="https://github.com/mongodb/${PN}/archive/legacy-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug libressl sasl ssl static-libs"
+
+RDEPEND="
+ !dev-db/tokumx
+ dev-libs/boost:=[threads(+)]
+ sasl? ( dev-libs/cyrus-sasl )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )"
+DEPEND="${RDEPEND}"
+
+# Maintainer notes
+# TODO: enable test in IUSE with
+# test? ( >=dev-cpp/gtest-1.7.0 dev-db/mongodb )
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.1.0-fix-scons.patch
+ "${FILESDIR}"/${PN}-1.1.2-boost-ref.patch
+)
+
+S="${WORKDIR}/${PN}-legacy-${PV}"
+
+src_configure() {
+ scons_opts=(
+ --cc=$(tc-getCC)
+ --cxx=$(tc-getCXX)
+ --cpppath="${EPREFIX}"/usr/include
+ --libpath="${EPREFIX}"/usr/$(get_libdir)
+ --variant-dir=build
+ --disable-warnings-as-errors
+ --sharedclient
+ )
+
+ use debug && scons_opts+=( --dbg=on )
+ use sasl && scons_opts+=( --use-sasl-client )
+ use ssl && scons_opts+=( --ssl )
+}
+
+src_compile() {
+ escons "${scons_opts[@]}" all
+}
+
+src_install() {
+ escons "${scons_opts[@]}" install --prefix="${ED%/}"/usr
+
+ # fix multilib-strict QA failures
+ mv "${ED%/}"/usr/{lib,$(get_libdir)} || die
+
+ einstalldocs
+
+ if ! use static-libs; then
+ find "${D}" -name '*.a' -delete || die
+ fi
+}
diff --git a/dev-libs/mongo-cxx-driver/mongo-cxx-driver-1.1.2.ebuild b/dev-libs/mongo-cxx-driver/mongo-cxx-driver-1.1.2.ebuild
deleted file mode 100644
index 724fdce..00000000
--- a/dev-libs/mongo-cxx-driver/mongo-cxx-driver-1.1.2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-SCONS_MIN_VERSION="2.3.0"
-
-inherit eutils multilib scons-utils
-
-DESCRIPTION="C++ Driver for MongoDB"
-HOMEPAGE="https://github.com/mongodb/mongo-cxx-driver"
-SRC_URI="https://github.com/mongodb/${PN}/archive/legacy-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug libressl sasl ssl static-libs"
-
-RDEPEND="!dev-db/tokumx
- >=dev-libs/boost-1.50[threads(+)]
- sasl? ( dev-libs/cyrus-sasl )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )"
-DEPEND="${RDEPEND}"
-
-# Maintainer notes
-# TODO: enable test in IUSE with
-# test? ( >=dev-cpp/gtest-1.7.0 dev-db/mongodb )
-
-DOCS=( README.md )
-
-S="${WORKDIR}/${PN}-legacy-${PV}"
-
-pkg_setup() {
- scons_opts="--variant-dir=build --cc=$(tc-getCC) --cxx=$(tc-getCXX)"
- scons_opts+=" --disable-warnings-as-errors --sharedclient"
-
- if use debug; then
- scons_opts+=" --dbg=on"
- fi
-
- if use prefix; then
- scons_opts+=" --cpppath=${EPREFIX}/usr/include"
- scons_opts+=" --libpath=${EPREFIX}/usr/$(get_libdir)"
- fi
-
- if use sasl; then
- scons_opts+=" --use-sasl-client"
- fi
-
- if use ssl; then
- scons_opts+=" --ssl"
- fi
-}
-
-src_prepare() {
- eapply_user
- epatch "${FILESDIR}/${PN}-1.1.0-fix-scons.patch"
-}
-
-src_compile() {
- escons "${scons_opts}" all
-}
-
-src_install() {
- escons ${scons_opts} install --prefix="${ED}"/usr
- use static-libs || find "${D}" -name '*.a' -delete
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/mongo-cxx-driver/files/, dev-libs/mongo-cxx-driver/
@ 2018-12-01 12:59 Sergei Trofimovich
0 siblings, 0 replies; 2+ messages in thread
From: Sergei Trofimovich @ 2018-12-01 12:59 UTC (permalink / raw
To: gentoo-commits
commit: a49d1c1409f75c4af9bf5f539bc06c1c7950e03a
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 1 12:59:21 2018 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Dec 1 12:59:39 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a49d1c14
dev-libs/mongo-cxx-driver: tweak for boost-167, bug #671422
Reported-by: Toralf Förster
Closes: https://bugs.gentoo.org/671422
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
.../files/mongo-cxx-driver-1.1.2-boost-next.patch | 21 +++++++++++++++++++++
.../mongo-cxx-driver-1.1.2-r1.ebuild | 3 ++-
2 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/dev-libs/mongo-cxx-driver/files/mongo-cxx-driver-1.1.2-boost-next.patch b/dev-libs/mongo-cxx-driver/files/mongo-cxx-driver-1.1.2-boost-next.patch
new file mode 100644
index 00000000000..68bdc4dc1a4
--- /dev/null
+++ b/dev-libs/mongo-cxx-driver/files/mongo-cxx-driver-1.1.2-boost-next.patch
@@ -0,0 +1,21 @@
+Add missing include for boost::next()
+
+https://bugs.gentoo.org/671422
+--- a/src/mongo/client/command_writer.cpp
++++ b/src/mongo/client/command_writer.cpp
+@@ -22,4 +22,6 @@
+ #include "mongo/db/namespace_string.h"
+
++#include <boost/next_prior.hpp>
++
+ namespace mongo {
+
+--- a/src/mongo/client/wire_protocol_writer.cpp
++++ b/src/mongo/client/wire_protocol_writer.cpp
+@@ -22,4 +22,6 @@
+ #include "mongo/db/namespace_string.h"
+
++#include <boost/next_prior.hpp>
++
+ namespace mongo {
+
diff --git a/dev-libs/mongo-cxx-driver/mongo-cxx-driver-1.1.2-r1.ebuild b/dev-libs/mongo-cxx-driver/mongo-cxx-driver-1.1.2-r1.ebuild
index 4b2e018de53..2dad3075312 100644
--- a/dev-libs/mongo-cxx-driver/mongo-cxx-driver-1.1.2-r1.ebuild
+++ b/dev-libs/mongo-cxx-driver/mongo-cxx-driver-1.1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -33,6 +33,7 @@ DEPEND="${RDEPEND}"
PATCHES=(
"${FILESDIR}"/${PN}-1.1.0-fix-scons.patch
"${FILESDIR}"/${PN}-1.1.2-boost-ref.patch
+ "${FILESDIR}"/${PN}-1.1.2-boost-next.patch
)
S="${WORKDIR}/${PN}-legacy-${PV}"
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-12-01 12:59 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-12-01 12:59 [gentoo-commits] repo/gentoo:master commit in: dev-libs/mongo-cxx-driver/files/, dev-libs/mongo-cxx-driver/ Sergei Trofimovich
-- strict thread matches above, loose matches on Subject: below --
2016-12-29 14:38 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox