commit: cf2853bb8e525a2aaf580c47ad556ff716bf9789 Author: Tomas Mozes <hydrapolic <AT> gmail <DOT> com> AuthorDate: Mon Mar 18 05:48:40 2019 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Thu Mar 28 17:39:07 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf2853bb
app-admin/mongo-tools: fix building with dev-lang/go-1.12 Bug: https://bugs.gentoo.org/678924 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com> Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> app-admin/mongo-tools/mongo-tools-3.6.10.ebuild | 7 +++++++ app-admin/mongo-tools/mongo-tools-3.6.8.ebuild | 5 ++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/app-admin/mongo-tools/mongo-tools-3.6.10.ebuild b/app-admin/mongo-tools/mongo-tools-3.6.10.ebuild index 5aacbbb1063..0e317acb91c 100644 --- a/app-admin/mongo-tools/mongo-tools-3.6.10.ebuild +++ b/app-admin/mongo-tools/mongo-tools-3.6.10.ebuild @@ -32,6 +32,13 @@ src_unpack() { mv ${MY_P} "${S}" || die } +src_prepare() { + default + + # allow building with go 1.12 #678924 + sed -i 's/_Ctype_struct_/C.struct_/' vendor/github.com/google/gopacket/pcap/pcap.go || die +} + src_compile() { local myconf=() diff --git a/app-admin/mongo-tools/mongo-tools-3.6.8.ebuild b/app-admin/mongo-tools/mongo-tools-3.6.8.ebuild index cb82aab24b2..81268b0dd2f 100644 --- a/app-admin/mongo-tools/mongo-tools-3.6.8.ebuild +++ b/app-admin/mongo-tools/mongo-tools-3.6.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -40,6 +40,9 @@ src_prepare() { if ! use ppc64; then sed -i 's/\(go build\)/\1 -buildmode=pie/g' build.sh || die fi + + # allow building with go 1.12 #678924 + sed -i 's/_Ctype_struct_/C.struct_/' vendor/src/github.com/google/gopacket/pcap/pcap.go || die } src_compile() {
