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 (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,62 +1,62 @@ @@ -1,62 +1,62 @@
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
15BUILD_MAKE_FLAGS+= CC=${CC:Q} 15BUILD_MAKE_FLAGS+= CC=${CC:Q}
16BUILD_MAKE_FLAGS+= CFLAGS=${CFLAGS:Q} 16BUILD_MAKE_FLAGS+= CFLAGS=${CFLAGS:Q}
17BUILD_MAKE_FLAGS+= LDFLAGS=${LDFLAGS:Q} 17BUILD_MAKE_FLAGS+= LDFLAGS=${LDFLAGS:Q}
18BUILD_MAKE_FLAGS+= TARGET=${TARGET} 18BUILD_MAKE_FLAGS+= TARGET=${TARGET}
19BUILD_MAKE_FLAGS+= USE_REGPARM=1 19BUILD_MAKE_FLAGS+= USE_REGPARM=1
20BUILD_MAKE_FLAGS+= USE_ZLIB=1 20BUILD_MAKE_FLAGS+= USE_ZLIB=1
21 21
22INSTALL_MAKE_FLAGS+= DOCDIR=${PREFIX}/share/doc/${PKGBASE} 22INSTALL_MAKE_FLAGS+= DOCDIR=${PREFIX}/share/doc/${PKGBASE}
23INSTALL_MAKE_FLAGS+= PREFIX=${PREFIX} 23INSTALL_MAKE_FLAGS+= PREFIX=${PREFIX}
24INSTALL_MAKE_FLAGS+= MANDIR=${PREFIX}/${PKGMANDIR} 24INSTALL_MAKE_FLAGS+= MANDIR=${PREFIX}/${PKGMANDIR}
25INSTALL_MAKE_FLAGS+= TARGET=${TARGET} 25INSTALL_MAKE_FLAGS+= TARGET=${TARGET}
26# skip install-doc 26# skip install-doc
27INSTALL_TARGET= install-bin install-man 27INSTALL_TARGET= install-bin install-man
28 28
29.include "options.mk" 29.include "options.mk"
30 30
31RCD_SCRIPTS= haproxy 31RCD_SCRIPTS= haproxy
32DOCDIR= ${PREFIX}/share/doc/${PKGBASE} 32DOCDIR= ${PREFIX}/share/doc/${PKGBASE}
33EGDIR= ${PREFIX}/share/examples/${PKGBASE} 33EGDIR= ${PREFIX}/share/examples/${PKGBASE}
34INSTALLATION_DIRS+= ${DOCDIR} ${EGDIR} 34INSTALLATION_DIRS+= ${DOCDIR} ${EGDIR}
35 35
36.include "../../mk/bsd.prefs.mk" 36.include "../../mk/bsd.prefs.mk"
37 37
38.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" 38.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD"
39TARGET= ${OPSYS:tl} 39TARGET= ${OPSYS:tl}
40.elif ${OPSYS} == "Darwin" 40.elif ${OPSYS} == "Darwin"
41TARGET= osx 41TARGET= osx
42.elif ${OPSYS} == "SunOS" 42.elif ${OPSYS} == "SunOS"
43TARGET= solaris 43TARGET= solaris
44.elif ${OPSYS} == "Linux" 44.elif ${OPSYS} == "Linux"
45TARGET= linux-glibc 45TARGET= 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"