From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B71541396D1 for ; Tue, 5 Sep 2017 08:17:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ECC851FC00F; Tue, 5 Sep 2017 08:17:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B84991FC00F for ; Tue, 5 Sep 2017 08:17:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5CA3933BEAE for ; Tue, 5 Sep 2017 08:17:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 98A3D8E27 for ; Tue, 5 Sep 2017 08:17:24 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1504599317.faee40dcab8c8344b772f0d414aa95b2579494d5.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/mongodb/, dev-db/mongodb/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/mongodb/files/mongodb-3.4.6-sysmacros-include.patch dev-db/mongodb/mongodb-3.4.6.ebuild X-VCS-Directories: dev-db/mongodb/ dev-db/mongodb/files/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: faee40dcab8c8344b772f0d414aa95b2579494d5 X-VCS-Branch: master Date: Tue, 5 Sep 2017 08:17:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 971852d0-ff23-4324-8115-193019c1dd77 X-Archives-Hash: 2d3ab6b952c8ce123c95da8f170ac892 commit: faee40dcab8c8344b772f0d414aa95b2579494d5 Author: David Seifert gentoo org> AuthorDate: Tue Sep 5 08:15:17 2017 +0000 Commit: David Seifert gentoo org> CommitDate: Tue Sep 5 08:15:17 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=faee40dc dev-db/mongodb: Add missing sys/sysmacros.h include Closes: https://bugs.gentoo.org/show_bug.cgi?id=629906 Package-Manager: Portage-2.3.8, Repoman-2.3.3 .../files/mongodb-3.4.6-sysmacros-include.patch | 38 ++++++++++++++++++++++ dev-db/mongodb/mongodb-3.4.6.ebuild | 13 ++++---- 2 files changed, 45 insertions(+), 6 deletions(-) diff --git a/dev-db/mongodb/files/mongodb-3.4.6-sysmacros-include.patch b/dev-db/mongodb/files/mongodb-3.4.6-sysmacros-include.patch new file mode 100644 index 00000000000..868ba73e442 --- /dev/null +++ b/dev-db/mongodb/files/mongodb-3.4.6-sysmacros-include.patch @@ -0,0 +1,38 @@ +From e245cac2b3c18015dee8caddd449532785d15c2b Mon Sep 17 00:00:00 2001 +From: Jason Carey +Date: Mon, 26 Jun 2017 11:09:10 -0400 +Subject: [PATCH] SERVER-29855 Pull major/minor from sys/sysmacros.h + +Per newer versions of glibc: + +---- +error: In the GNU C Library, "major" is defined + by . For historical compatibility, it is + currently defined by as well, but we plan to + remove this soon. To use "major", include + directly. If you did not intend to use a system-defined macro + "major", you should undefine it after including . [-Werror] + string path = str::stream() << "/sys/dev/block/" << major(dev) << ':' << minor(dev) +---- + +Including appears to be the correct solution to quiet +the warning +--- + src/mongo/db/storage/mmap_v1/mmap_v1_engine.cpp | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/mongo/db/storage/mmap_v1/mmap_v1_engine.cpp b/src/mongo/db/storage/mmap_v1/mmap_v1_engine.cpp +index 5a784b25dc7..c43e148d3f4 100644 +--- a/src/mongo/db/storage/mmap_v1/mmap_v1_engine.cpp ++++ b/src/mongo/db/storage/mmap_v1/mmap_v1_engine.cpp +@@ -36,6 +36,10 @@ + #include + #include + ++#ifdef __linux__ ++#include ++#endif ++ + #include "mongo/db/mongod_options.h" + #include "mongo/db/storage/mmap_v1/data_file_sync.h" + #include "mongo/db/storage/mmap_v1/dur.h" diff --git a/dev-db/mongodb/mongodb-3.4.6.ebuild b/dev-db/mongodb/mongodb-3.4.6.ebuild index 18751f0bf10..5900f1f4fac 100644 --- a/dev-db/mongodb/mongodb-3.4.6.ebuild +++ b/dev-db/mongodb/mongodb-3.4.6.ebuild @@ -100,12 +100,13 @@ pkg_setup() { } src_prepare() { - epatch "${FILESDIR}/${PN}-3.4.0-fix-scons.patch" - epatch "${FILESDIR}/${P}-no-boost-check.patch" - epatch "${FILESDIR}/${PN}-3.4.4-Replace-string-with-explicit-std-string.patch" - if has_version ">=dev-libs/boost-1.62"; then - epatch "${FILESDIR}/${PN}-3.2.10-boost-1.62.patch" - fi + epatch \ + "${FILESDIR}/${PN}-3.4.0-fix-scons.patch" \ + "${FILESDIR}/${P}-no-boost-check.patch" \ + "${FILESDIR}/${PN}-3.4.4-Replace-string-with-explicit-std-string.patch" \ + "${FILESDIR}/${PN}-3.2.10-boost-1.62.patch" \ + "${FILESDIR}/${PN}-3.4.6-sysmacros-include.patch" + epatch_user }