nanomsg: Remove patch dependency and use upstream project

2016-08-07 18:10:47 +02:00 · 2016-08-07 18:10:47 +02:00 · 1d6f0c6822
commit 1d6f0c6822
parent eb70ea8ae1
4 changed files with 3 additions and 7 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -16,9 +16,6 @@
 [submodule "dependencies/nanomsg"]
 	path = dependencies/nanomsg
 	url = https://github.com/nanomsg/nanomsg.git
-[submodule "dependencies/nanomsg-patched"]
-	path = dependencies/nanomsg-patched
-	url = https://github.com/Snaipe/nanomsg.git
 [submodule "dependencies/debugbreak"]
 	path = dependencies/debugbreak
 	url = https://github.com/scottt/debugbreak
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -35,12 +35,12 @@ else ()
 endif ()

 cr_add_subproject (nanomsg
-  PATH dependencies/nanomsg-patched
+  PATH dependencies/nanomsg
  OPTS
    -DNN_TESTS=OFF
    -DNN_TOOLS=OFF
-    -DNN_FORK_STRATEGY=RESET
    -DNN_STATIC_LIB=ON
+    -DCMAKE_INSTALL_LIBDIR=lib
    "-DCMAKE_C_FLAGS=${NN_C_FLAGS}"
  CMAKE
 )
--- a/dependencies/nanomsg
+++ b/dependencies/nanomsg
@ -1 +1 @@
-Subproject commit fd66ff55a5bad44ea0c3cca8bea345b6f02663bf
+Subproject commit 7e12a20e038234060d41d03c20721d08117f8607
--- a/dependencies/nanomsg-patched
+++ b/dependencies/nanomsg-patched
@ -1 +0,0 @@
-Subproject commit 8e0095aa750f300003afb27cb408df3f9b6b2364
				`@ -1 +0,0 @@`
				`Subproject commit 8e0095aa750f300003afb27cb408df3f9b6b2364`