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@gmail.com>
Signed-off-by: Zac Medico <zmedico@gentoo.org>

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 5aacbbb1063705df444950f050bb5c86bde6a672..0e317acb91c91a6e0a0f22189e72571a7ca9c786 100644 (file)
--- 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 cb82aab24b25f8adb8dee7dba477e8870642e788..81268b0dd2fa38494d4d5d2e00ac607930decea4 100644 (file)
--- 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() {