bind: Disable atomic operations on i386 too.diff -r1.35 -r1.36 pkgsrc/net/bind911/Makefile
(nia)
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | # $NetBSD: Makefile,v 1.35 2020/12/19 14:44:15 taca Exp $ | 1 | # $NetBSD: Makefile,v 1.36 2021/01/13 09:34:30 nia Exp $ | |
2 | 2 | |||
3 | DISTNAME= bind-${BIND_VERSION} | 3 | DISTNAME= bind-${BIND_VERSION} | |
4 | PKGNAME= ${DISTNAME:S/-P/pl/} | 4 | PKGNAME= ${DISTNAME:S/-P/pl/} | |
5 | CATEGORIES= net | 5 | CATEGORIES= net | |
6 | MASTER_SITES= ftp://ftp.isc.org/isc/bind9/${BIND_VERSION}/ | 6 | MASTER_SITES= ftp://ftp.isc.org/isc/bind9/${BIND_VERSION}/ | |
7 | DISTFILES+= ${DEFAULT_DISTFILES} bind-9.11.25-fixed-man-pages.tar.gz | 7 | DISTFILES+= ${DEFAULT_DISTFILES} bind-9.11.25-fixed-man-pages.tar.gz | |
8 | 8 | |||
9 | MAINTAINER= pkgsrc-users@NetBSD.org | 9 | MAINTAINER= pkgsrc-users@NetBSD.org | |
10 | HOMEPAGE= https://www.isc.org/software/bind/ | 10 | HOMEPAGE= https://www.isc.org/software/bind/ | |
11 | COMMENT= Berkeley Internet Name Daemon implementation of DNS, version 9.11 | 11 | COMMENT= Berkeley Internet Name Daemon implementation of DNS, version 9.11 | |
12 | LICENSE= mpl-2.0 | 12 | LICENSE= mpl-2.0 | |
13 | 13 | |||
14 | CONFLICTS+= host-[0-9]* | 14 | CONFLICTS+= host-[0-9]* | |
@@ -26,27 +26,28 @@ BUILD_DEFS+= BIND_DIR VARBASE | @@ -26,27 +26,28 @@ BUILD_DEFS+= BIND_DIR VARBASE | |||
26 | USE_TOOLS+= pax perl pkg-config tar | 26 | USE_TOOLS+= pax perl pkg-config tar | |
27 | USE_LIBTOOL= yes | 27 | USE_LIBTOOL= yes | |
28 | GNU_CONFIGURE= yes | 28 | GNU_CONFIGURE= yes | |
29 | MAKE_ENV+= WRKDIR=${WRKDIR} PREFIX=${PREFIX} | 29 | MAKE_ENV+= WRKDIR=${WRKDIR} PREFIX=${PREFIX} | |
30 | 30 | |||
31 | CONFIGURE_ARGS+= --with-libtool | 31 | CONFIGURE_ARGS+= --with-libtool | |
32 | CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} | 32 | CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} | |
33 | CONFIGURE_ARGS+= --localstatedir=${VARBASE} | 33 | CONFIGURE_ARGS+= --localstatedir=${VARBASE} | |
34 | CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} | 34 | CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} | |
35 | CONFIGURE_ARGS+= --with-python=no | 35 | CONFIGURE_ARGS+= --with-python=no | |
36 | CONFIGURE_ARGS+= --with-lmdb=no | 36 | CONFIGURE_ARGS+= --with-lmdb=no | |
37 | .if !empty(MACHINE_PLATFORM:MNetBSD-*-m68k) || \ | 37 | .if !empty(MACHINE_PLATFORM:MNetBSD-*-m68k) || \ | |
38 | !empty(MACHINE_PLATFORM:MNetBSD-*-mipsel) || \ | 38 | !empty(MACHINE_PLATFORM:MNetBSD-*-mipsel) || \ | |
39 | !empty(MACHINE_PLATFORM:MNetBSD-*-vax) | 39 | !empty(MACHINE_PLATFORM:MNetBSD-*-vax) || \ | |
40 | !empty(MACHINE_PLATFORM:MNetBSD-*-i386) | |||
40 | CONFIGURE_ARGS+= --disable-atomic | 41 | CONFIGURE_ARGS+= --disable-atomic | |
41 | .endif | 42 | .endif | |
42 | .if ${MACHINE_PLATFORM:MNetBSD-*-powerpc} != "" | 43 | .if ${MACHINE_PLATFORM:MNetBSD-*-powerpc} != "" | |
43 | CONFIGURE_ARGS+= --disable-threads | 44 | CONFIGURE_ARGS+= --disable-threads | |
44 | .endif | 45 | .endif | |
45 | CONFIGURE_ARGS.DragonFly+= --disable-kqueue | 46 | CONFIGURE_ARGS.DragonFly+= --disable-kqueue | |
46 | 47 | |||
47 | PKG_GROUPS_VARS+= BIND_GROUP | 48 | PKG_GROUPS_VARS+= BIND_GROUP | |
48 | PKG_USERS_VARS= BIND_USER | 49 | PKG_USERS_VARS= BIND_USER | |
49 | 50 | |||
50 | PKG_GROUPS= ${BIND_GROUP} | 51 | PKG_GROUPS= ${BIND_GROUP} | |
51 | PKG_USERS= ${BIND_USER}:${BIND_GROUP} | 52 | PKG_USERS= ${BIND_USER}:${BIND_GROUP} | |
52 | 53 |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | # $NetBSD: Makefile,v 1.7 2020/12/19 16:41:36 taca Exp $ | 1 | # $NetBSD: Makefile,v 1.8 2021/01/13 09:34:30 nia Exp $ | |
2 | 2 | |||
3 | DISTNAME= bind-${BIND_VERSION} | 3 | DISTNAME= bind-${BIND_VERSION} | |
4 | PKGNAME= ${DISTNAME:S/-P/pl/} | 4 | PKGNAME= ${DISTNAME:S/-P/pl/} | |
5 | CATEGORIES= net | 5 | CATEGORIES= net | |
6 | MASTER_SITES= ftp://ftp.isc.org/isc/bind9/${BIND_VERSION}/ | 6 | MASTER_SITES= ftp://ftp.isc.org/isc/bind9/${BIND_VERSION}/ | |
7 | EXTRACT_SUFX= .tar.xz | 7 | EXTRACT_SUFX= .tar.xz | |
8 | 8 | |||
9 | MAINTAINER= pkgsrc-users@NetBSD.org | 9 | MAINTAINER= pkgsrc-users@NetBSD.org | |
10 | HOMEPAGE= https://www.isc.org/software/bind/ | 10 | HOMEPAGE= https://www.isc.org/software/bind/ | |
11 | COMMENT= Berkeley Internet Name Daemon implementation of DNS, version 9.14 | 11 | COMMENT= Berkeley Internet Name Daemon implementation of DNS, version 9.14 | |
12 | LICENSE= mpl-2.0 | 12 | LICENSE= mpl-2.0 | |
13 | 13 | |||
14 | CONFLICTS+= host-[0-9]* | 14 | CONFLICTS+= host-[0-9]* | |
@@ -28,27 +28,28 @@ CHECK_FILES_SKIP= bin/tests/system/syste | @@ -28,27 +28,28 @@ CHECK_FILES_SKIP= bin/tests/system/syste | |||
28 | MAKE_ENV+= WRKDIR=${WRKDIR} PREFIX=${PREFIX} | 28 | MAKE_ENV+= WRKDIR=${WRKDIR} PREFIX=${PREFIX} | |
29 | 29 | |||
30 | .if ${OPSYS} == "Linux" && !exists(/usr/include/sys/capability.h) | 30 | .if ${OPSYS} == "Linux" && !exists(/usr/include/sys/capability.h) | |
31 | CONFIGURE_ARGS+= --disable-linux-caps | 31 | CONFIGURE_ARGS+= --disable-linux-caps | |
32 | .endif | 32 | .endif | |
33 | 33 | |||
34 | CONFIGURE_ARGS+= --with-libtool | 34 | CONFIGURE_ARGS+= --with-libtool | |
35 | CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} | 35 | CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} | |
36 | CONFIGURE_ARGS+= --localstatedir=${VARBASE} | 36 | CONFIGURE_ARGS+= --localstatedir=${VARBASE} | |
37 | CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} | 37 | CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} | |
38 | CONFIGURE_ARGS+= --with-python=no | 38 | CONFIGURE_ARGS+= --with-python=no | |
39 | .if !empty(MACHINE_PLATFORM:MNetBSD-*-m68k) || \ | 39 | .if !empty(MACHINE_PLATFORM:MNetBSD-*-m68k) || \ | |
40 | !empty(MACHINE_PLATFORM:MNetBSD-*-mipsel) || \ | 40 | !empty(MACHINE_PLATFORM:MNetBSD-*-mipsel) || \ | |
41 | !empty(MACHINE_PLATFORM:MNetBSD-*-vax) | 41 | !empty(MACHINE_PLATFORM:MNetBSD-*-vax) || \ | |
42 | !empty(MACHINE_PLATFORM:MNetBSD-*-i386) | |||
42 | CONFIGURE_ARGS+= --disable-atomic | 43 | CONFIGURE_ARGS+= --disable-atomic | |
43 | .endif | 44 | .endif | |
44 | CONFIGURE_ARGS.DragonFly+= --disable-kqueue | 45 | CONFIGURE_ARGS.DragonFly+= --disable-kqueue | |
45 | CONFIGURE_ARGS.SunOS+= --disable-epoll | 46 | CONFIGURE_ARGS.SunOS+= --disable-epoll | |
46 | 47 | |||
47 | BUILDLINK_TRANSFORM.SunOS+= rm:-zrelax=transtls | 48 | BUILDLINK_TRANSFORM.SunOS+= rm:-zrelax=transtls | |
48 | 49 | |||
49 | PKG_GROUPS_VARS+= BIND_GROUP | 50 | PKG_GROUPS_VARS+= BIND_GROUP | |
50 | PKG_USERS_VARS= BIND_USER | 51 | PKG_USERS_VARS= BIND_USER | |
51 | 52 | |||
52 | PKG_GROUPS= ${BIND_GROUP} | 53 | PKG_GROUPS= ${BIND_GROUP} | |
53 | PKG_USERS= ${BIND_USER}:${BIND_GROUP} | 54 | PKG_USERS= ${BIND_USER}:${BIND_GROUP} | |
54 | 55 |