Sun Dec 23 23:51:26 2018 UTC ()
protobuf: fix build failure on NetBSD/i386 8.0.  PR pkg/53659

Assume and specify -march=i586 for 64 bit atomic ops, as firefox does.
"Looks ok" by wiz@.


(tsutsui)
diff -r1.16 -r1.17 pkgsrc/devel/protobuf/Makefile
cvs diff -r1.16 -r1.17 pkgsrc/devel/protobuf/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/protobuf/Makefile 2018/08/04 21:19:39 1.16
+++ pkgsrc/devel/protobuf/Makefile 2018/12/23 23:51:26 1.17
@@ -1,30 +1,35 @@ @@ -1,30 +1,35 @@
1# $NetBSD: Makefile,v 1.16 2018/08/04 21:19:39 minskim Exp $ 1# $NetBSD: Makefile,v 1.17 2018/12/23 23:51:26 tsutsui Exp $
2 2
3.include "Makefile.common" 3.include "Makefile.common"
4 4
5DISTNAME= protobuf-cpp-${PROTOBUFVER} 5DISTNAME= protobuf-cpp-${PROTOBUFVER}
6PKGNAME= ${DISTNAME:S/-cpp//} 6PKGNAME= ${DISTNAME:S/-cpp//}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9COMMENT= Google protocol buffers 9COMMENT= Google protocol buffers
10 10
11GNU_CONFIGURE= yes 11GNU_CONFIGURE= yes
12USE_LIBTOOL= yes 12USE_LIBTOOL= yes
13USE_LANGUAGES= c++11 c 13USE_LANGUAGES= c++11 c
14USE_TOOLS+= autoreconf automake autoconf gmake 14USE_TOOLS+= autoreconf automake autoconf gmake
15 15
16SET_LIBDIR= yes 16SET_LIBDIR= yes
17 17
18PKGCONFIG_OVERRIDE+= protobuf-lite.pc.in 18PKGCONFIG_OVERRIDE+= protobuf-lite.pc.in
19PKGCONFIG_OVERRIDE+= protobuf.pc.in 19PKGCONFIG_OVERRIDE+= protobuf.pc.in
20 20
21TEST_TARGET= check 21TEST_TARGET= check
22 22
 23.if ${MACHINE_ARCH} == "i386"
 24# 64 bit atomic ops are required
 25CXXFLAGS+= -march=i586
 26.endif
 27
23pre-configure: 28pre-configure:
24 ${RUN} cd ${WRKSRC} && ./autogen.sh 29 ${RUN} cd ${WRKSRC} && ./autogen.sh
25 30
26.include "../../devel/googletest/buildlink3.mk" 31.include "../../devel/googletest/buildlink3.mk"
27BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.0.4 32BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.0.4
28.include "../../devel/zlib/buildlink3.mk" 33.include "../../devel/zlib/buildlink3.mk"
29.include "../../mk/pthread.buildlink3.mk" 34.include "../../mk/pthread.buildlink3.mk"
30.include "../../mk/bsd.pkg.mk" 35.include "../../mk/bsd.pkg.mk"