CVS commit: [pkgsrc-2020Q1] pkgsrc/net/grpc

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Wed Jun 17 11:55:08 UTC 2020

Modified Files:
        pkgsrc/net/grpc [pkgsrc-2020Q1]: Makefile

Log Message:
Pullup ticket #6238 - requested by nia
net/grpc: i386 build fix

Revisions pulled up:
- net/grpc/Makefile                                             1.26

---
   Module Name: pkgsrc
   Committed By:        nia
   Date:                Sat Jun 13 11:26:31 UTC 2020

   Modified Files:
        pkgsrc/net/grpc: Makefile

   Log Message:
   grpc: needs 64-bit atomic ops


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.23.2.1 pkgsrc/net/grpc/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/grpc/Makefile
diff -u pkgsrc/net/grpc/Makefile:1.23 pkgsrc/net/grpc/Makefile:1.23.2.1
--- pkgsrc/net/grpc/Makefile:1.23       Sun Mar 15 22:27:52 2020
+++ pkgsrc/net/grpc/Makefile    Wed Jun 17 11:55:08 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2020/03/15 22:27:52 adam Exp $
+# $NetBSD: Makefile,v 1.23.2.1 2020/06/17 11:55:08 bsiegert Exp $
 
 DISTNAME=      grpc-1.27.3
 CATEGORIES=    net
@@ -24,6 +24,14 @@ CMAKE_ARGS+= -DgRPC_PROTOBUF_PROVIDER=pa
 CMAKE_ARGS+=   -DgRPC_SSL_PROVIDER=package
 CMAKE_ARGS+=   -DgRPC_ZLIB_PROVIDER=package
 
+.include "../../mk/bsd.prefs.mk"
+
+# 64 bit atomic ops are required
+.if ${MACHINE_ARCH} == "i386"
+CFLAGS+=               -march=i586
+CXXFLAGS+=             -march=i586
+.endif
+
 .include "../../benchmarks/google-benchmark/buildlink3.mk"
 .include "../../devel/abseil/buildlink3.mk"
 .include "../../devel/gflags/buildlink3.mk"