fixes for compilation/linking problems on linux

Author: dgrove-oss

src/Makefile.am

@@ -87,10 +87,11 @@ if BUILD_OWN_BLOCKS_RUNTIME
 libdispatch_la_SOURCES+= BlocksRuntime/data.c BlocksRuntime/runtime.c
 CBLOCKS_FLAGS+= -I$(top_srcdir)/src/BlocksRuntime
 CXXBLOCKS_FLAGS+= -I$(top_srcdir)/src/BlocksRuntime
+BLOCKS_RUNTIME_LIBS=-ldl
 endif
 
 libdispatch_la_LDFLAGS=-avoid-version
-libdispatch_la_LIBADD=$(KQUEUE_LIBS) $(PTHREAD_WORKQUEUE_LIBS) $(BSD_OVERLAY_LIBS)
+libdispatch_la_LIBADD=$(KQUEUE_LIBS) $(PTHREAD_WORKQUEUE_LIBS) $(BSD_OVERLAY_LIBS) $(BLOCKS_RUNTIME_LIBS)
 
 if HAVE_DARWIN_LD
 libdispatch_la_LDFLAGS+=-Wl,-compatibility_version,1 \

src/init.c

@@ -1197,7 +1197,7 @@ dispatch_source_type_readwrite_init(dispatch_source_t ds,
 	dispatch_queue_t q DISPATCH_UNUSED)
 {
 	ds->ds_is_level = true;
-#ifdef HAVE_DECL_NOTE_LOWAT
+#if HAVE_DECL_NOTE_LOWAT
 	// bypass kernel check for device kqueue support rdar://19004921
 	ds->ds_dkev->dk_kevent.fflags = NOTE_LOWAT;
 #endif

src/queue.c

@@ -2734,12 +2734,16 @@ _dispatch_block_create_with_voucher_and_priority(dispatch_block_flags_t flags,
 	bool assign = (flags & DISPATCH_BLOCK_ASSIGN_CURRENT);
 
 	if (assign && !(flags & DISPATCH_BLOCK_HAS_VOUCHER)) {
+#if OS_VOUCHER_ACTIVITY_SPI
 		voucher = VOUCHER_CURRENT;
+#endif
 		flags |= DISPATCH_BLOCK_HAS_VOUCHER;
 	}
+#if OS_VOUCHER_ACTIVITY_SPI
 	if (voucher == VOUCHER_CURRENT) {
 		voucher = _voucher_get();
 	}
+#endif
 	if (assign && !(flags & DISPATCH_BLOCK_HAS_PRIORITY)) {
 		pri = _dispatch_priority_propagate();
 		flags |= DISPATCH_BLOCK_HAS_PRIORITY;

src/shims/linux_stubs.h

@@ -47,8 +47,6 @@ typedef uint32_t voucher_activity_trace_id_t;
 
 typedef uint32_t voucher_activity_id_t;
 
-typedef uint32_t _voucher_activity_buffer_hook_t;;
-
 typedef uint32_t voucher_activity_flag_t;
 
 typedef struct { } mach_msg_header_t;

src/voucher.c

@@ -1560,6 +1560,7 @@ _voucher_init(void)
 {
 }
 
+#if OS_VOUCHER_ACTIVITY_SPI
 void*
 voucher_activity_get_metadata_buffer(size_t *length)
 {
@@ -1631,6 +1632,7 @@ voucher_activity_initialize_4libtrace(voucher_activity_hooks_t hooks)
 {
 	(void)hooks;
 }
+#endif // OS_VOUCHER_ACTIVITY_SPI
 
 size_t
 _voucher_debug(voucher_t v, char* buf, size_t bufsiz)

src/voucher_internal.h

@@ -90,8 +90,10 @@ voucher_get_mach_voucher(voucher_t voucher);
 void _voucher_init(void);
 void _voucher_atfork_child(void);
 void _voucher_activity_debug_channel_init(void);
+#if OS_VOUCHER_ACTIVITY_SPI
 void _voucher_activity_swap(firehose_activity_id_t old_id,
 		firehose_activity_id_t new_id);
+#endif
 void _voucher_xref_dispose(voucher_t voucher);
 void _voucher_dispose(voucher_t voucher);
 size_t _voucher_debug(voucher_t v, char* buf, size_t bufsiz);