From 70d99c6ffe2409c60f5ef7959109a3e9fc6c5bdc Mon Sep 17 00:00:00 2001 From: rm Date: Mon, 21 May 2012 20:35:20 +0000 Subject: - update to 1.0.5 - fix build fix clang - mark MAKE_JOBS_SAFE PR: 168014 Submitted by: Hirohisa Yamaguchi Approved by: freebsd at dns-lab dot com (maintainer) --- dns/knot/Makefile | 8 +++-- dns/knot/distinfo | 4 +-- dns/knot/files/extrapatch-configure | 42 ++++++++++++++++++++++ dns/knot/files/patch-src__config.h.in | 11 ++++++ dns/knot/files/patch-src__knot__server__dthreads.h | 14 ++++++++ 5 files changed, 75 insertions(+), 4 deletions(-) create mode 100644 dns/knot/files/extrapatch-configure create mode 100644 dns/knot/files/patch-src__config.h.in create mode 100644 dns/knot/files/patch-src__knot__server__dthreads.h diff --git a/dns/knot/Makefile b/dns/knot/Makefile index 51ba042034a0..f62a08d4d491 100644 --- a/dns/knot/Makefile +++ b/dns/knot/Makefile @@ -6,7 +6,7 @@ # PORTNAME= knot -PORTVERSION= 1.0.3 +PORTVERSION= 1.0.5 CATEGORIES= dns ipv6 MASTER_SITES= http://public.nic.cz/files/knot-dns/ \ http://www.dns-lab.com/downloads/knot-dns/ @@ -15,14 +15,18 @@ MAINTAINER= freebsd@dns-lab.com COMMENT= Knot DNS is a high performance authoritative-only DNS server LICENSE= GPLv3 -LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= bison:${PORTSDIR}/devel/bison \ flex>=2.5.35_1:${PORTSDIR}/textproc/flex LIB_DEPENDS= urcu.1:${PORTSDIR}/sysutils/userspace-rcu +.if ${CC} == "clang" +EXTRA_PATCHES+= ${FILESDIR}/extrapatch-configure +.endif + CONFIGURE_ARGS= --sysconfdir=${ETCDIR} GNU_CONFIGURE= yes +MAKE_JOBS_SAFE= yes USE_AUTOTOOLS= libtool USE_OPENSSL= yes diff --git a/dns/knot/distinfo b/dns/knot/distinfo index 200c7c127a03..ee3693fecd44 100644 --- a/dns/knot/distinfo +++ b/dns/knot/distinfo @@ -1,2 +1,2 @@ -SHA256 (knot-1.0.3.tar.gz) = a9950727cbeff91ccccc2978c4dee9afbc30904006871ac53dba70b7e1c23513 -SIZE (knot-1.0.3.tar.gz) = 1066720 +SHA256 (knot-1.0.5.tar.gz) = 9476aa0444f4c8e9ec96bb284aa7b03a746a8ddfef5dbd287fcb6efedcfcc1dd +SIZE (knot-1.0.5.tar.gz) = 1064340 diff --git a/dns/knot/files/extrapatch-configure b/dns/knot/files/extrapatch-configure new file mode 100644 index 000000000000..0d16fcdfa7b7 --- /dev/null +++ b/dns/knot/files/extrapatch-configure @@ -0,0 +1,42 @@ +--- ./configure.orig 2012-05-17 18:19:19.000000000 +0900 ++++ ./configure 2012-05-17 21:40:12.000000000 +0900 +@@ -13237,38 +13237,7 @@ + fi + + +-# Check for link time optimizations support and predictive commoning +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts \"-flto\"" >&5 +-$as_echo_n "checking whether C compiler accepts \"-flto\"... " >&6; } +-ax_save_FLAGS=$CFLAGS +- CFLAGS=""-flto"" +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- eval `$as_echo "ax_cv_c_flags_"-flto"" | $as_tr_sh`=yes +-else +- eval `$as_echo "ax_cv_c_flags_"-flto"" | $as_tr_sh`=no +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- CFLAGS=$ax_save_FLAGS +-eval ax_check_compiler_flags=$`$as_echo "ax_cv_c_flags_"-flto"" | $as_tr_sh` +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_check_compiler_flags" >&5 +-$as_echo "$ax_check_compiler_flags" >&6; } +-if test "x$ax_check_compiler_flags" = xyes; then +- CFLAGS="$CFLAGS -flto" +-else +- : +-fi +- ++# Check for predictive commoning + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts \"-fpredictive-commoning\"" >&5 + $as_echo_n "checking whether C compiler accepts \"-fpredictive-commoning\"... " >&6; } + ax_save_FLAGS=$CFLAGS diff --git a/dns/knot/files/patch-src__config.h.in b/dns/knot/files/patch-src__config.h.in new file mode 100644 index 000000000000..c48f7aa9c3f8 --- /dev/null +++ b/dns/knot/files/patch-src__config.h.in @@ -0,0 +1,11 @@ +--- ./src/config.h.in.orig 2012-05-17 20:44:57.000000000 +0900 ++++ ./src/config.h.in 2012-05-17 20:46:19.000000000 +0900 +@@ -362,3 +362,8 @@ + + /* Define as `fork' if `vfork' does not work. */ + #undef vfork ++ ++/* Define cpu_set_t because does not define. */ ++#if defined(__FreeBSD__) ++#define cpu_set_t cpuset_t ++#endif diff --git a/dns/knot/files/patch-src__knot__server__dthreads.h b/dns/knot/files/patch-src__knot__server__dthreads.h new file mode 100644 index 000000000000..1512ee3f230d --- /dev/null +++ b/dns/knot/files/patch-src__knot__server__dthreads.h @@ -0,0 +1,14 @@ +--- ./src/knot/server/dthreads.h.orig 2012-05-17 18:14:06.000000000 +0900 ++++ ./src/knot/server/dthreads.h 2012-05-17 20:44:41.000000000 +0900 +@@ -40,6 +40,11 @@ + #define _KNOTD_DTHREADS_H_ + + #include ++#ifdef HAVE_PTHREAD_SETAFFINITY_NP ++# if defined(__FreeBSD__) ++#include ++# endif ++#endif + + /* Forward decls */ + struct dthread_t; \ No newline at end of file -- cgit