Skip to content

Instantly share code, notes, and snippets.

@raku-cat
Created May 3, 2018 15:35
Show Gist options
  • Save raku-cat/4b204ab462265345622f2d29a2694bb4 to your computer and use it in GitHub Desktop.
Save raku-cat/4b204ab462265345622f2d29a2694bb4 to your computer and use it in GitHub Desktop.
diff --git a/configure.ac b/configure.ac
index 2d58b398..6dce3ea1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -307,8 +307,6 @@ AC_SEARCH_LIBS([dlopen], [dl], [],
AX_PTHREAD([
AC_DEFINE([HAVE_PTHREAD], [1], [Define if you have POSIX threads libraries and header files.])
- appendCXX "$PTHREAD_CFLAGS"
- appendLib "$PTHREAD_LIBS"
], [
AC_MSG_ERROR([This compiler/OS doesn't seem to support pthreads.])
])
diff --git a/include/znc/Threads.h b/include/znc/Threads.h
index 51ad3476..0e2ad116 100644
--- a/include/znc/Threads.h
+++ b/include/znc/Threads.h
@@ -29,6 +29,7 @@
#include <cstring>
#include <list>
#include <pthread.h>
+#include <bthread.h>
#include <mutex>
#include <condition_variable>
diff --git a/include/znc/main.h b/include/znc/main.h
index 61f1f433..9a6f1c6a 100644
--- a/include/znc/main.h
+++ b/include/znc/main.h
@@ -19,6 +19,7 @@
#include <znc/zncconfig.h>
#include <znc/version.h>
+#include <bthread.h>
extern bool ZNC_NO_NEED_TO_DO_ANYTHING_ON_MODULE_CALL_EXITER;
#define NOTHING &ZNC_NO_NEED_TO_DO_ANYTHING_ON_MODULE_CALL_EXITER
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7bd456f1..d2321bef 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -27,7 +27,11 @@ set(znc_cpp "ZNCString.cpp" "znc.cpp" "IRCNetwork.cpp" "Translation.cpp"
"Threads.cpp" "Query.cpp" "SSLVerifyHost.cpp" "Message.cpp" "User.cpp")
znc_add_library(znclib ${lib_type} ${znc_cpp} "Csocket.cpp" "versionc.cpp")
znc_add_executable(znc "main.cpp")
-target_link_libraries(znc PRIVATE znclib)
+link_directories("/data/data/com.termux/files/usr/include")
+include_directories("/data/data/com.termux/files/usr/include")
+find_package( BTHREAD )
+target_link_libraries(znc PRIVATE znclib ${BTHREAD_LIBRARIES} bthread)
+target_link_libraries(znc PUBLIC ${BTHREAD_LIBRARIES} bthread)
copy_csocket(copy_csocket_cc
"${PROJECT_SOURCE_DIR}/third_party/Csocket/Csocket.cc"
diff --git a/src/main.cpp b/src/main.cpp
index 6ea10ec9..cbba8416 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -17,6 +17,7 @@
#include <znc/znc.h>
#include <signal.h>
#include <time.h>
+#include <bthread.h>
#include <thread>
#if defined(HAVE_LIBSSL) && defined(HAVE_PTHREAD) && \
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment