Attachment 183908 Details for Bug 220355 – unbroken i386 in dns/knot2

[patch] unbroken i386 in dns/knot2

knot2.diff.txt (text/plain), 1.32 KB, created by Leo Vandewoestijne on 2017-06-29 12:20:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Leo Vandewoestijne

Created: 2017-06-29 12:20:09 UTC

Size: 1.32 KB

patch

obsolete

>diff -ruN dns/knot2.orig/Makefile dns/knot2/Makefile
>--- dns/knot2.orig/Makefile	2017-06-25 11:18:50.000000000 +0000
>+++ dns/knot2/Makefile	2017-06-29 12:15:08.277119000 +0000
>@@ -18,7 +18,7 @@
> 		libnettle.so:security/nettle \
> 		liburcu.so:sysutils/liburcu
> 
>-CONFLICTS=	knot-1.* knot1-[0-6].*
>+CONFLICTS_INSTALL=	knot-1.* knot1-[0-6].*
> 
> USES=		autoreconf alias compiler:c11 libedit libtool localbase pkgconfig python shebangfix tar:xz
> SHEBANG_FILES=	src/utils/pykeymgr/pykeymgr.in
>@@ -40,8 +40,6 @@
> 
> PORTDOCS=	AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS
> 
>-BROKEN_i386=	Issues in knot/modules/*/*.c: undefined reference to '__atomic_fetch_add_8'
>-
> OPTIONS_DEFINE=			DNSTAP FASTPARSER IDN
> 
> DNSTAP_DESC=			dnstap support (see dnstap.info)
>@@ -61,6 +59,16 @@
> IDN_CONFIGURE_WITH=		libidn
> IDN_LIB_DEPENDS=		libidn.so:dns/libidn
> 
>+.include <bsd.port.pre.mk>
>+.if ${ARCH} == "i386"
>+GNU_CONFIGURE=  yes
>+USE_GCC=        4.8+
>+CFLAGS+=        -march=i686
>+.else
>+HAS_CONFIGURE=  yes
>+CC=             clang
>+.endif
>+
> post-patch:
> 	@${REINPLACE_CMD} 's|$$(INSTALL) -d $$(DESTDIR)/\@run_dir\@|#$$(INSTALL) -d $$(DESTDIR)/\@run_dir\@|' \
> 		${WRKSRC}/src/Makefile.in
>@@ -74,4 +82,4 @@
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
> 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>

Flags:

freebsd: maintainer-approval+

Actions: View | Diff

Attachments on bug 220355: 183908 | 183915 | 184074 | 184209 | 184472