Attachment 209692 Details for Bug 242411 – remove libedit and liburcu as dependency in case of libknot

[patch] remove libedit and liburcu as dependency in case of libknot

knot2_2.diff.txt (text/plain), 1.73 KB, created by Leo Vandewoestijne on 2019-12-04 14:07:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Leo Vandewoestijne

Created: 2019-12-04 14:07:25 UTC

Size: 1.73 KB

patch

obsolete

>diff -ruN knot2.orig/Makefile knot2/Makefile
>--- knot2.orig/Makefile	2019-12-03 17:54:49.000000000 +0000
>+++ knot2/Makefile	2019-12-04 13:43:01.275909000 +0000
>@@ -13,16 +13,12 @@
> 
> LICENSE=	GPLv3
> 
>-NOT_FOR_ARCHS=	i386
>-NOT_FOR_ARCHS_REASON_i386=Uses 64 bit atomics that clang cannot generate on i386
>-
> LIB_DEPENDS=	libgnutls.so:security/gnutls \
>-		liblmdb.so:databases/lmdb \
>-		liburcu.so:sysutils/liburcu
>+		liblmdb.so:databases/lmdb
> 
> CONFLICTS=	knot-1.* knot1-[0-6].*
> 
>-USES=		alias compiler:c11 libedit libtool localbase ncurses pkgconfig python tar:xz
>+USES=		alias compiler:c11 libtool localbase ncurses pkgconfig python tar:xz
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--enable-recvmmsg=no \
> 		--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
>@@ -57,6 +53,8 @@
> 
> .if !defined(LIB_ONLY)
> OPTIONS_DEFINE+=		IDN
>+USES+=				libedit
>+LIB_DEPENDS+=			liburcu.so:sysutils/liburcu
> .endif
> 
> .if !defined(UTILS_ONLY) && !defined(LIB_ONLY)
>diff -ruN knot2.orig/files/patch-src_libdnssec_Makefile.inc knot2/files/patch-src_libdnssec_Makefile.inc
>--- knot2.orig/files/patch-src_libdnssec_Makefile.inc	1970-01-01 00:00:00.000000000 +0000
>+++ knot2/files/patch-src_libdnssec_Makefile.inc	2019-12-04 13:20:28.311819000 +0000
>@@ -0,0 +1,11 @@
>+--- src/libdnssec/Makefile.inc.orig	2019-12-04 13:20:04 UTC
>++++ src/libdnssec/Makefile.inc
>+@@ -2,7 +2,7 @@ lib_LTLIBRARIES += libdnssec.la
>+ pkgconfig_DATA  += libdnssec.pc
>+ 
>+ libdnssec_la_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAG_VISIBILITY) $(gnutls_CFLAGS)
>+-libdnssec_la_LDFLAGS  = $(AM_LDFLAGS) $(libdnssec_VERSION_INFO) $(LDFLAG_EXCLUDE_LIBS)
>++libdnssec_la_LDFLAGS  = $(AM_LDFLAGS) $(libdnssec_VERSION_INFO)
>+ libdnssec_la_LIBADD   = libcontrib.la $(gnutls_LIBS)
>+ if ENABLE_PKCS11
>+ libdnssec_la_LIBADD  += $(pthread_LIBS)

Flags:

freebsd: maintainer-approval-

Actions: View | Diff

Attachments on bug 242411: 209667 | 209691 | 209692