pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel/go-protobuf Fix build with Go 1.10, bump revision.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/10028e9be273
branches:  trunk
changeset: 376992:10028e9be273
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Sun Mar 11 19:45:21 2018 +0000

description:
Fix build with Go 1.10, bump revision.

Go 1.10 no longer builds a .a file from the testdata (which are not
supposed to be compiled anyway). Remove from PLIST and remove it explicitly
in the build, so this can be compiled with older Go too.

diffstat:

 devel/go-protobuf/Makefile |  5 ++++-
 devel/go-protobuf/PLIST    |  3 +--
 2 files changed, 5 insertions(+), 3 deletions(-)

diffs (33 lines):

diff -r a2fa3d1f33d8 -r 10028e9be273 devel/go-protobuf/Makefile
--- a/devel/go-protobuf/Makefile        Sun Mar 11 19:44:45 2018 +0000
+++ b/devel/go-protobuf/Makefile        Sun Mar 11 19:45:21 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2018/03/04 15:52:16 bsiegert Exp $
+# $NetBSD: Makefile,v 1.8 2018/03/11 19:45:21 bsiegert Exp $
 
 DISTNAME=              go-protobuf-20160829
 PKGREVISION=           5
@@ -18,5 +18,8 @@
 
 CHECK_RELRO_SKIP+=     bin/protoc-gen-go
 
+pre-install:
+       ${RM} -f ${WRKSRC}/pkg/${GO_PLATFORM}/github.com/golang/protobuf/proto/testdata.a
+
 .include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r a2fa3d1f33d8 -r 10028e9be273 devel/go-protobuf/PLIST
--- a/devel/go-protobuf/PLIST   Sun Mar 11 19:44:45 2018 +0000
+++ b/devel/go-protobuf/PLIST   Sun Mar 11 19:45:21 2018 +0000
@@ -1,10 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1 2016/09/11 08:02:30 bsiegert Exp $
+@comment $NetBSD: PLIST,v 1.2 2018/03/11 19:45:21 bsiegert Exp $
 bin/protoc-gen-go
 gopkg/pkg/${GO_PLATFORM}/github.com/golang/protobuf/jsonpb.a
 gopkg/pkg/${GO_PLATFORM}/github.com/golang/protobuf/jsonpb/jsonpb_test_proto.a
 gopkg/pkg/${GO_PLATFORM}/github.com/golang/protobuf/proto.a
 gopkg/pkg/${GO_PLATFORM}/github.com/golang/protobuf/proto/proto3_proto.a
-gopkg/pkg/${GO_PLATFORM}/github.com/golang/protobuf/proto/testdata.a
 gopkg/pkg/${GO_PLATFORM}/github.com/golang/protobuf/protoc-gen-go/descriptor.a
 gopkg/pkg/${GO_PLATFORM}/github.com/golang/protobuf/protoc-gen-go/generator.a
 gopkg/pkg/${GO_PLATFORM}/github.com/golang/protobuf/protoc-gen-go/grpc.a



Home | Main Index | Thread Index | Old Index