Attachment #211311 for bug #242665




# $FreeBSD: head/dns/knot2/Makefile 518954 2019-12-03 17:54:49Z pi $

PORTNAME=	knot
DISTVERSION=	2.9.2
CATEGORIES=	dns
MASTER_SITES=	https://secure.nic.cz/files/knot-dns/ \
		https://dns.company/downloads/knot-dns/

COMMENT?=	High performance authoritative-only DNS server

LICENSE=	GPLv3
LICENSE_FILE=	${WRKSRC}/COPYING

CONFLICTS=	knot-1.* knot1-[0-6].*
NOT_FOR_ARCHS_REASON_i386=Uses 64 bit atomics that clang cannot generate on i386

BUILD_DEPENDS=	autoconf>=2.65:devel/autoconf

LIB_DEPENDS=	libgnutls.so:security/gnutls \
		liblmdb.so:databases/lmdb
		liburcu.so:sysutils/liburcu

USES=		alias libtool localbase pkgconfig tar:xz

HAS_CONFIGURE=	yes
GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--enable-recvmmsg=no \
		--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \
		--mandir=${MANPREFIX}/man

.if !defined(UTILS_ONLY) && !defined(LIB_ONLY)
CONFIGURE_ARGS+=	--with-rundir=/var/run/knot \
			--with-storage=/var/db/knot
USE_RC_SUBR=	${PORTNAME}
SUB_FILES=	pkg-message
USES+=		libedit
LIB_DEPENDS+=	liburcu.so:sysutils/liburcu
.endif

.if defined(UTILS_ONLY) || defined(LIB_ONLY)

.endif

USE_LDCONFIG=	yes
LLD_UNSAFE=	yes
INSTALL_TARGET=	install-strip

USERS=		knot

# in higher line count.  Ideally this bug should be fixed upstream.
DNSTAP_CPPFLAGS=		-I${LOCALBASE}/include

DOCS_USES+=			python
DOCS_CONFIGURE_OFF=		--disable-documentation

FASTPARSER_DESC=		Fast zone parser (demanding compilation)
FASTPARSER_CONFIGURE_ENABLE=	fastparser

IDN_CONFIGURE_WITH=		libidn
IDN_CONFIGURE_OFF=		--without-libidn
IDN_LIB_DEPENDS=		libidn2.so:dns/libidn2

MAXMINDDB_DESC=			Enable MaxMind for geodb module
MAXMINDDB_LIB_DEPENDS=		libmaxminddb.so:net/libmaxminddb
MAXMINDDB_CONFIGURE_ENABLE=	maxminddb

.include <bsd.port.options.mk>

.if ${ARCH} == i386
USES+=				autoreconf
EXTRA_PATCHES+=			${PATCHDIR}/extrapatch-configure.ac
.endif

post-patch:
.if !defined(UTILS_ONLY) && !defined(LIB_ONLY)

Lines 1-3 Link Here

(-)dns/knot2/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1574091844	1	TIMESTAMP = 1576799805
2	SHA256 (knot-2.9.1.tar.xz) = f19121956caa360c387923654f13e4c97b3fb9093d242e110d7e0916b8d8a04d	2	SHA256 (knot-2.9.2.tar.xz) = 298cdf33aa7589b50df7e5833694b24cd2de8b6d17cee7e1673873fe576db6ee
3	SIZE (knot-2.9.1.tar.xz) = 1212460	3	SIZE (knot-2.9.2.tar.xz) = 1181860




--- configure.ac.orig	2020-02-03 00:11:36 UTC
+++ configure.ac
@@ -636,7 +636,8 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <sched.h>]]
 AC_LINK_IFELSE(
   [AC_LANG_PROGRAM([[#include <stdint.h>]],
                    [[uint64_t val = 0; __atomic_add_fetch(&val, 1, __ATOMIC_RELAXED);]])],
-  [AC_DEFINE(HAVE_ATOMIC, 1, [Define to 1 if you have '__atomic' functions.])]
+  [AS_IF([test -z "$CC_CLANG_VERSION" -o $host_cpu != "i386"],
+         [AC_DEFINE(HAVE_ATOMIC, 1, [Define to 1 if you have '__atomic' functions.])])]
 )
 
 # Check for '__sync' compiler builtin atomic functions.

Return to bug 242665

Lines 2-8 Link Here

(-)dns/knot2/Makefile (-10 / +23 lines)
2	# $FreeBSD: head/dns/knot2/Makefile 518954 2019-12-03 17:54:49Z pi $	2	# $FreeBSD: head/dns/knot2/Makefile 518954 2019-12-03 17:54:49Z pi $
3		3
4	PORTNAME= knot	4	PORTNAME= knot
5	DISTVERSION= 2.9.1	5	DISTVERSION= 2.9.2
6	CATEGORIES= dns	6	CATEGORIES= dns
7	MASTER_SITES= https://secure.nic.cz/files/knot-dns/ \	7	MASTER_SITES= https://secure.nic.cz/files/knot-dns/ \
8	https://dns.company/downloads/knot-dns/	8	https://dns.company/downloads/knot-dns/
Lines 12-37 Link Here
12	COMMENT?= High performance authoritative-only DNS server	12	COMMENT?= High performance authoritative-only DNS server
13		13
14	LICENSE= GPLv3	14	LICENSE= GPLv3
		15	LICENSE_FILE= ${WRKSRC}/COPYING
15		16
16	NOT_FOR_ARCHS= i386	17	CONFLICTS= knot-1.* knot1-[0-6].*
17	NOT_FOR_ARCHS_REASON_i386=Uses 64 bit atomics that clang cannot generate on i386
18		18
		19	BUILD_DEPENDS= autoconf>=2.65:devel/autoconf
		20
19	LIB_DEPENDS= libgnutls.so:security/gnutls \	21	LIB_DEPENDS= libgnutls.so:security/gnutls \
20	liblmdb.so:databases/lmdb \	22	liblmdb.so:databases/lmdb
21	liburcu.so:sysutils/liburcu
22		23
23	CONFLICTS= knot-1.* knot1-[0-6].*	24	USES= alias libtool localbase pkgconfig tar:xz
24		25
25	USES= alias compiler:c11 libedit libtool localbase ncurses pkgconfig python tar:xz	26	HAS_CONFIGURE= yes
26	GNU_CONFIGURE= yes
27	CONFIGURE_ARGS= --enable-recvmmsg=no \	27	CONFIGURE_ARGS= --enable-recvmmsg=no \
28	--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig	28	--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \
		29	--mandir=${MANPREFIX}/man
29		30
30	.if !defined(UTILS_ONLY) && !defined(LIB_ONLY)	31	.if !defined(UTILS_ONLY) && !defined(LIB_ONLY)
31	CONFIGURE_ARGS+= --with-rundir=/var/run/knot \	32	CONFIGURE_ARGS+= --with-rundir=/var/run/knot \
32	--with-storage=/var/db/knot	33	--with-storage=/var/db/knot
33	USE_RC_SUBR= ${PORTNAME}	34	USE_RC_SUBR= ${PORTNAME}
34	SUB_FILES= pkg-message	35	SUB_FILES= pkg-message
		36	USES+= libedit
		37	LIB_DEPENDS+= liburcu.so:sysutils/liburcu
35	.endif	38	.endif
36		39
37	.if defined(UTILS_ONLY) \|\| defined(LIB_ONLY)	40	.if defined(UTILS_ONLY) \|\| defined(LIB_ONLY)
Lines 44-50 Link Here
44	.endif	47	.endif
45		48
46	USE_LDCONFIG= yes	49	USE_LDCONFIG= yes
47	LLD_UNSAFE= yes
48	INSTALL_TARGET= install-strip	50	INSTALL_TARGET= install-strip
49		51
50	USERS= knot	52	USERS= knot
Lines 75-89 Link Here
75	# in higher line count. Ideally this bug should be fixed upstream.	77	# in higher line count. Ideally this bug should be fixed upstream.
76	DNSTAP_CPPFLAGS= -I${LOCALBASE}/include	78	DNSTAP_CPPFLAGS= -I${LOCALBASE}/include
77		79
		80	DOCS_USES+= python
		81	DOCS_CONFIGURE_OFF= --disable-documentation
		82
78	FASTPARSER_DESC= Fast zone parser (demanding compilation)	83	FASTPARSER_DESC= Fast zone parser (demanding compilation)
79	FASTPARSER_CONFIGURE_ENABLE= fastparser	84	FASTPARSER_CONFIGURE_ENABLE= fastparser
80		85
81	IDN_CONFIGURE_WITH= libidn	86	IDN_CONFIGURE_WITH= libidn
		87	IDN_CONFIGURE_OFF= --without-libidn
82	IDN_LIB_DEPENDS= libidn2.so:dns/libidn2	88	IDN_LIB_DEPENDS= libidn2.so:dns/libidn2
83		89
84	MAXMINDDB_DESC= Enable MaxMind for geodb module	90	MAXMINDDB_DESC= Enable MaxMind for geodb module
85	MAXMINDDB_LIB_DEPENDS= libmaxminddb.so:net/libmaxminddb	91	MAXMINDDB_LIB_DEPENDS= libmaxminddb.so:net/libmaxminddb
86	MAXMINDDB_CONFIGURE_ENABLE= maxminddb	92	MAXMINDDB_CONFIGURE_ENABLE= maxminddb
		93
		94	.include <bsd.port.options.mk>
		95
		96	.if ${ARCH} == i386
		97	USES+= autoreconf
		98	EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-configure.ac
		99	.endif
87		100
88	post-patch:	101	post-patch:
89	.if !defined(UTILS_ONLY) && !defined(LIB_ONLY)	102	.if !defined(UTILS_ONLY) && !defined(LIB_ONLY)

Line 0 Link Here

(-)dns/knot2/files/extrapatch-configure.ac (+12 lines)
	1	--- configure.ac.orig 2020-02-03 00:11:36 UTC
	2	+++ configure.ac
	3	@@ -636,7 +636,8 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <sched.h>]]
	4	AC_LINK_IFELSE(
	5	[AC_LANG_PROGRAM([[#include <stdint.h>]],
	6	[[uint64_t val = 0; __atomic_add_fetch(&val, 1, __ATOMIC_RELAXED);]])],
	7	- [AC_DEFINE(HAVE_ATOMIC, 1, [Define to 1 if you have '__atomic' functions.])]
	8	+ [AS_IF([test -z "$CC_CLANG_VERSION" -o $host_cpu != "i386"],
	9	+ [AC_DEFINE(HAVE_ATOMIC, 1, [Define to 1 if you have '__atomic' functions.])])]
	10	)
	11
	12	# Check for '__sync' compiler builtin atomic functions.