updates to compile with latest Swift

Author: dgrove-oss

configure.ac

@@ -108,12 +108,12 @@ AC_ARG_WITH([swift-toolchain],
   [AS_HELP_STRING([--with-swift-toolchain], [Specify path to Swift toolchain])],
   [swift_toolchain_path=${withval}
    AC_DEFINE(HAVE_SWIFT, 1, [Define if building for Swift])
-   SWIFTC="$swift_toolchain_path/bin/swiftc"
+   SWIFT_TOOLCHAIN_PATH="$swift_toolchain_path"
    have_swift=true],
   [have_swift=false]
 )
 AM_CONDITIONAL(HAVE_SWIFT, $have_swift)
-AC_SUBST([SWIFTC])
+AC_SUBST([SWIFT_TOOLCHAIN_PATH])
 
 AC_USE_SYSTEM_EXTENSIONS
 AM_INIT_AUTOMAKE([foreign no-dependencies subdir-objects])

dispatch/dispatch.h

@@ -32,6 +32,10 @@
 #include <stdarg.h>
 #include <unistd.h>
 #include <fcntl.h>
+#ifndef __APPLE__
+#include <stdio.h>
+#include <sys/types.h>
+#endif
 
 #ifndef __OSX_AVAILABLE_STARTING
 #define __OSX_AVAILABLE_STARTING(x, y)

src/Makefile.am

@@ -73,8 +73,14 @@ else
   endif
 endif
 
+if HAVE_SWIFT
+  SWIFTC=${SWIFT_TOOLCHAIN_PATH}/bin/swiftc
+  SWIFT_RUNTIME_LIBS=$(SWIFT_TOOLCHAIN_PATH)/lib/swift/linux
+  SWIFT_LIBS=-L$(SWIFT_RUNTIME_LIBS) -lswiftCore
+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) $(SWIFT_LIBS)
 
 if HAVE_DARWIN_LD
 libdispatch_la_LDFLAGS+=-Wl,-compatibility_version,1 \

src/swift/Dispatch.swift

@@ -32,13 +32,13 @@ import CDispatch
 
 public typealias dispatch_object_t = DispatchObject
 public class DispatchObject {
-  let cobj:COpaquePointer;
+  let cobj:OpaquePointer;
 
   deinit {
       CDispatch.dispatch_release(_to_dot(cobj))
   }
 
-  init(_ cobj:COpaquePointer) {
+  init(_ cobj:OpaquePointer) {
     self.cobj = cobj;
   }
 }
@@ -312,7 +312,7 @@ public func dispatch_block_testcancel(block:dispatch_block_t) -> Int {
 // source.h
 //////////
 
-public typealias dispatch_source_type_t = COpaquePointer
+public typealias dispatch_source_type_t = OpaquePointer
 
 public var DISPATCH_SOURCE_TYPE_DATA_ADD: dispatch_source_type_t {
   return _swift_dispatch_source_type_data_add()
@@ -601,7 +601,7 @@ public func dispatch_io_set_interval(channel:dispatch_io_t,
 internal let mainQueue:dispatch_queue_t = DispatchQueue(CDispatch.dispatch_get_main_queue())
 
 @_silgen_name("_swift_dispatch_object_type_punner")
-internal func _to_dot(x:COpaquePointer) -> CDispatch.dispatch_object_t
+internal func _to_dot(x:OpaquePointer) -> CDispatch.dispatch_object_t
 
 @warn_unused_result
 @_silgen_name("_swift_dispatch_queue_concurrent")

tests/Makefile.am

@@ -2,6 +2,11 @@
 #
 #
 
+if HAVE_SWIFT
+  SWIFT_RUNTIME_LIBS=$(SWIFT_TOOLCHAIN_PATH)/lib/swift/linux
+  SWIFT_LIBS=-L$(SWIFT_RUNTIME_LIBS) -lswiftCore
+endif
+
 AUTOMAKE_OPTIONS = subdir-objects
 
 noinst_LTLIBRARIES=libbsdtests.la
@@ -121,7 +126,7 @@ if !BUILD_OWN_PTHREAD_WORKQUEUES
   endif
 endif
 
-LDADD=libbsdtests.la $(top_builddir)/src/libdispatch.la $(KQUEUE_LIBS) $(PTHREAD_WORKQUEUE_LIBS) $(BSD_OVERLAY_LIBS)
+LDADD=libbsdtests.la $(top_builddir)/src/libdispatch.la $(KQUEUE_LIBS) $(PTHREAD_WORKQUEUE_LIBS) $(BSD_OVERLAY_LIBS) $(SWIFT_LIBS)
 libbsdtests_la_LDFLAGS=-avoid-version
 
 bsdtestsummarize_LDADD=-lm $(BSD_OVERLAY_LIBS)