[Midnightbsd-cvs] src [7363] U trunk/apache/lib/libdispatch: turn on the blocks runtime with libdispatch

[laffer1 at midnightbsd.org]

Revision: 7363
          http://svnweb.midnightbsd.org/src/?rev=7363
Author:   laffer1
Date:     2015-11-19 23:30:17 -0500 (Thu, 19 Nov 2015)
Log Message:
-----------
turn on the blocks runtime with libdispatch

Modified Paths:
--------------
    trunk/apache/lib/libdispatch/Makefile
    trunk/apache/lib/libdispatch/config.h

Property Changed:
----------------
    trunk/apache/lib/libdispatch/Makefile
    trunk/apache/lib/libdispatch/config.h

Modified: trunk/apache/lib/libdispatch/Makefile
===================================================================
--- trunk/apache/lib/libdispatch/Makefile	2015-11-20 02:38:10 UTC (rev 7362)
+++ trunk/apache/lib/libdispatch/Makefile	2015-11-20 04:30:17 UTC (rev 7363)
@@ -1,4 +1,4 @@
-# $MidnightBSD: src/apache/lib/libdispatch/Makefile,v 1.4 2010/08/16 00:04:23 laffer1 Exp $
+# $MidnightBSD$
 
 .PATH: ${.CURDIR}/../../../contrib/libdispatch/src
 SRCDIR=	${.CURDIR}/../../../contrib/libdispatch/src
@@ -12,6 +12,8 @@
 WARNS?= 2
 CSTD=	gnu89
 
+CFLAGS+=	-fblocks -D__BLOCKS__=1
+
 .PATH:  ${.CURDIR}/../../../contrib/libdispatch/dispatch
 INCS=	base.h dispatch.h group.h object.h once.h \
 	queue.h semaphore.h source.h time.h
@@ -75,7 +77,7 @@
         dispatch_source_create.3 dispatch_source_set_timer.3 \
         dispatch_time.3 dispatch_walltime.3
 
-DPADD=          ${LIBPTHREAD}
-LDADD=          -lpthread
+DPADD=          ${LIBPTHREAD} ${LIBBLOCKSRUNTIME}
+LDADD=          -lpthread -lBlocksRuntime
 
 .include <bsd.lib.mk>


Property changes on: trunk/apache/lib/libdispatch/Makefile
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.5
\ No newline at end of property
Modified: trunk/apache/lib/libdispatch/config.h
===================================================================
--- trunk/apache/lib/libdispatch/config.h	2015-11-20 02:38:10 UTC (rev 7362)
+++ trunk/apache/lib/libdispatch/config.h	2015-11-20 04:30:17 UTC (rev 7363)
@@ -90,6 +90,8 @@
 /* Define to 1 if you have the <memory.h> header file. */
 #define HAVE_MEMORY_H 1
 
+#define HAVE_BLOCKS	1
+
 /* Define if __builtin_trap marked noreturn */
 #define HAVE_NORETURN_BUILTIN_TRAP 1
 


Property changes on: trunk/apache/lib/libdispatch/config.h
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property