Fri Jul 16 10:29:10 2021 UTC ()
haproxy: Limit aarch64 libatomic include to NetBSD.

Fixes build on Darwin/aarch64.


(jperkin)
diff -r1.80 -r1.81 pkgsrc/net/haproxy/Makefile

cvs diff -r1.80 -r1.81 pkgsrc/net/haproxy/Makefile (expand / switch to unified diff)

--- pkgsrc/net/haproxy/Makefile 2021/07/08 12:24:37 1.80
+++ pkgsrc/net/haproxy/Makefile 2021/07/16 10:29:10 1.81
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.80 2021/07/08 12:24:37 adam Exp $ 1# $NetBSD: Makefile,v 1.81 2021/07/16 10:29:10 jperkin Exp $
2 2
3DISTNAME= haproxy-2.4.2 3DISTNAME= haproxy-2.4.2
4CATEGORIES= net www 4CATEGORIES= net www
5MASTER_SITES= https://www.haproxy.org/download/${PKGVERSION_NOREV:R}/src/ 5MASTER_SITES= https://www.haproxy.org/download/${PKGVERSION_NOREV:R}/src/
6 6
7MAINTAINER= morr@NetBSD.org 7MAINTAINER= morr@NetBSD.org
8HOMEPAGE= https://www.haproxy.org/ 8HOMEPAGE= https://www.haproxy.org/
9COMMENT= Reliable, high performance TCP/HTTP load balancer 9COMMENT= Reliable, high performance TCP/HTTP load balancer
10LICENSE= gnu-gpl-v2 10LICENSE= gnu-gpl-v2
11 11
12USE_LANGUAGES= c 12USE_LANGUAGES= c
13USE_TOOLS+= gmake 13USE_TOOLS+= gmake
14BUILD_MAKE_FLAGS+= ADDLIB=${COMPILER_RPATH_FLAG}${PREFIX}/lib 14BUILD_MAKE_FLAGS+= ADDLIB=${COMPILER_RPATH_FLAG}${PREFIX}/lib
@@ -46,17 +46,17 @@ TARGET= linux-glibc @@ -46,17 +46,17 @@ TARGET= linux-glibc
46.else 46.else
47TARGET= generic 47TARGET= generic
48.endif 48.endif
49 49
50LIBS.SunOS+= -lxnet 50LIBS.SunOS+= -lxnet
51 51
52post-install: 52post-install:
53 ${INSTALL_DATA} ${WRKSRC}/doc/architecture.txt ${DESTDIR}${DOCDIR}/ 53 ${INSTALL_DATA} ${WRKSRC}/doc/architecture.txt ${DESTDIR}${DOCDIR}/
54 ${INSTALL_DATA} ${WRKSRC}/doc/configuration.txt ${DESTDIR}${DOCDIR}/ 54 ${INSTALL_DATA} ${WRKSRC}/doc/configuration.txt ${DESTDIR}${DOCDIR}/
55 ${INSTALL_DATA} ${WRKSRC}/examples/*.cfg ${DESTDIR}${EGDIR}/ 55 ${INSTALL_DATA} ${WRKSRC}/examples/*.cfg ${DESTDIR}${EGDIR}/
56 56
57.include "../../devel/zlib/buildlink3.mk" 57.include "../../devel/zlib/buildlink3.mk"
58.include "../../mk/atomic64.mk" 58.include "../../mk/atomic64.mk"
59.if ${MACHINE_ARCH} == "aarch64" 59.if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64)
60.include "../../devel/libatomic/buildlink3.mk" 60.include "../../devel/libatomic/buildlink3.mk"
61.endif 61.endif
62.include "../../mk/bsd.pkg.mk" 62.include "../../mk/bsd.pkg.mk"