Apply IXWebSocket patch automatically

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bc498f6..51631de 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -63,6 +63,12 @@ option(WITH_TOOLS "Build utility tools"  NO)
 add_subdirectory(src/additional/libqrencode)
 add_subdirectory(src/additional/IXWebSocket)
 
+# Apply patch for IXWebSocket issue
+execute_process (
+    COMMAND sh -c "${CMAKE_CURRENT_SOURCE_DIR}/src/additional/fix_cerrno.sh"
+    OUTPUT_VARIABLE outIxVar
+)
+
 # Set default root path for berkeley db
 if (NOT BerkeleyDB_ROOT)
 set(BerkeleyDB_ROOT /usr)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1db96fa..3535a6a 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -47,6 +47,12 @@ set(OPENSSL_USE_STATIC_LIBS ON)
 find_package(OpenSSL REQUIRED)
 add_subdirectory(additional/IXWebSocket)
 
+# Apply patch for IXWebSocket issue
+execute_process (
+    COMMAND sh -c "${CMAKE_CURRENT_SOURCE_DIR}/additional/fix_cerrno.sh"
+    OUTPUT_VARIABLE outIxVar
+)
+
 # Set default root path for berkeley db
 if (NOT BerkeleyDB_ROOT)
 set(BerkeleyDB_ROOT /usr)

diff --git a/src/additional/build.sh b/src/additional/build.sh
deleted file mode 100755 (executable)
index 2efca59..0000000
--- a/src/additional/build.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-ROOT=$(pwd)
-
-git submodule update --init --recursive
-mkdir $ROOT/IXWebSocket/build
-cd $ROOT/IXWebSocket/build
-cmake -DCMAKE_INSTALL_PREFIX:PATH=/ -DCMAKE_OSX_DEPLOYMENT_TARGET=11.0 ..
-make -j 4
-make DESTDIR=$ROOT/stage install
-cd $ROOT
-
-mkdir $ROOT/leveldb/build
-cd $ROOT/leveldb/build
-git reset --hard 4cb80b7ddce6ff6089b15d8cfebf746fc1572477
-cmake -DCMAKE_INSTALL_PREFIX:PATH=/ -DCMAKE_OSX_DEPLOYMENT_TARGET=11.0 ..
-make -j 4
-make DESTDIR=$ROOT/stage install
-cd $ROOT

diff --git a/src/additional/cerrno_include.patch b/src/additional/cerrno_include.patch
new file mode 100644 (file)
index 0000000..52ce953
--- /dev/null
+++ b/src/additional/cerrno_include.patch
@@ -0,0 +1,12 @@
+diff --git a/ixwebsocket/IXNetSystem.h b/ixwebsocket/IXNetSystem.h
+index 21131b4..7ca58f4 100644
+--- a/ixwebsocket/IXNetSystem.h
++++ b/ixwebsocket/IXNetSystem.h
+@@ -17,6 +17,7 @@
+ #include <basetsd.h>
+ #include <io.h>
+ #include <ws2def.h>
++#include <cerrno>
+ 
+ #undef EWOULDBLOCK
+ #undef EAGAIN

diff --git a/src/additional/fix_cerrno.sh b/src/additional/fix_cerrno.sh
new file mode 100755 (executable)
index 0000000..7796f85
--- /dev/null
+++ b/src/additional/fix_cerrno.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+PREVDIR=$(pwd)
+SCRIPT=$(readlink -f $0)
+ROOT=`dirname $SCRIPT`
+
+cd $ROOT/IXWebSocket
+git reset --hard 8c15405
+patch -s -p1 < ../cerrno_include.patch
+git -c user.name='CryptoManiac' -c user.email='balthazar@yandex.ru' commit -a -m 'Fix cerrno'
+cd $PREVDIR