Attachment 124528 Details for Bug 168014 – file.diff

[patch] file.diff

file.diff (text/plain), 4.46 KB, created by Hirohisa Yamaguchi on 2012-05-17 16:10:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hirohisa Yamaguchi

Created: 2012-05-17 16:10:01 UTC

Size: 4.46 KB

patch

obsolete

>Index: dns/knot/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/dns/knot/Makefile,v
>retrieving revision 1.5
>diff -u -r1.5 Makefile
>--- dns/knot/Makefile	24 Apr 2012 14:13:26 -0000	1.5
>+++ dns/knot/Makefile	17 May 2012 14:58:58 -0000
>@@ -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/
>@@ -21,8 +21,13 @@
> 		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
> 
>Index: dns/knot/distinfo
>===================================================================
>RCS file: /home/ncvs/ports/dns/knot/distinfo,v
>retrieving revision 1.2
>diff -u -r1.2 distinfo
>--- dns/knot/distinfo	24 Apr 2012 14:13:26 -0000	1.2
>+++ dns/knot/distinfo	17 May 2012 14:58:58 -0000
>@@ -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
>cvs diff: Diffing dns/knot/files
>Index: dns/knot/files/extrapatch-configure
>===================================================================
>RCS file: dns/knot/files/extrapatch-configure
>diff -N dns/knot/files/extrapatch-configure
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ dns/knot/files/extrapatch-configure	17 May 2012 14:58:58 -0000
>@@ -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
>Index: dns/knot/files/patch-src__config.h.in
>===================================================================
>RCS file: dns/knot/files/patch-src__config.h.in
>diff -N dns/knot/files/patch-src__config.h.in
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ dns/knot/files/patch-src__config.h.in	17 May 2012 14:58:58 -0000
>@@ -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 <sys/cpuset.h> does not define. */
>++#if defined(__FreeBSD__)
>++#define cpu_set_t cpuset_t
>++#endif
>Index: dns/knot/files/patch-src__knot__server__dthreads.h
>===================================================================
>RCS file: dns/knot/files/patch-src__knot__server__dthreads.h
>diff -N dns/knot/files/patch-src__knot__server__dthreads.h
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ dns/knot/files/patch-src__knot__server__dthreads.h	17 May 2012 14:58:58 -0000
>@@ -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 <pthread.h>
>++#ifdef HAVE_PTHREAD_SETAFFINITY_NP
>++# if defined(__FreeBSD__)
>++#include <pthread_np.h>
>++# endif
>++#endif
>+ 
>+ /* Forward decls */
>+ struct dthread_t;

Actions: View | Diff

Attachments on bug 168014: 124528