Commit c2c94c4f authored by Drew's avatar Drew

Remove AnarchyDispatch

Rely on "system" libdispatch baked into the swift image This is
available on my snapshot image swift-DEVELOPMENT-SNAPSHOT-2016-02-08-a
parent 6700a96c
[submodule "AnarchyDispatch"]
path = AnarchyDispatch
url = https://github.com/AnarchyTools/AnarchyDispatch.git
Subproject commit 377e5b176544f46307818d24091627425f55f1c7
......@@ -7,15 +7,11 @@ RUN tar xf atbuild.tar.xz -C /usr/local
#provide some relief for caching
#these lines can actually be commented out, but make the build process more cacheable
#speeding up build times in common cases
# AnarchyDispatch
WORKDIR NaOH
ADD AnarchyDispatch /NaOH/AnarchyDispatch
ADD build.atpkg /NaOH/build.atpkg
RUN atbuild AnarchyDispatch.default
# libsodium
ADD libsodium /NaOH/libsodium
RUN atbuild libsodium
ADD . /NaOH
RUN LD_LIBRARY_PATH=AnarchyDispatch/build/lib atbuild check --use-overlay linux
\ No newline at end of file
RUN atbuild check --use-overlay linux
\ No newline at end of file
......@@ -13,7 +13,9 @@
import Foundation
#if ATBUILD
import CSodium
import AnarchyDispatch
#endif
#if os(Linux)
import Dispatch
#endif
func sodium_init_wrap() {
......
(package
:name "NaOH"
:import-packages ["AnarchyDispatch/build.atpkg"]
:tasks {
:libsodium {
......@@ -14,16 +12,15 @@
:sources ["NaOH/**.swift"]
:name "NaOH"
:output-type "static-library"
:dependencies ["libsodium" "AnarchyDispatch.default"]
:dependencies ["libsodium"]
:publish-product true
:compile-options ["-I" "libsodium/" "-enable-testing"]
:overlays {
:osx {
:use-overlays ["AnarchyDispatch.compile-osx"]
}
:linux {
:use-overlays ["AnarchyDispatch.compile-linux"]
:compile-options ["-I" "/usr/local/include/dispatch/haxx" "-Xcc" "-fblocks"]
}
}
}
......@@ -42,10 +39,9 @@
:publish-product true
:overlays {
:osx {
:use-overlays ["AnarchyDispatch.compile-osx"]
}
:linux {
:use-overlays ["AnarchyDispatch.compile-linux"]
:compile-options ["-I" "/usr/local/include/dispatch/haxx" "-Xcc" "-fblocks"]
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment