FreeBSD Bugzilla – Attachment 184476 Details for
Bug 220827
net/mosquitto: Fails to build with WS option (websockets support) enabled
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
mosquitto patch
mos.patch (text/plain), 1.94 KB, created by
Iblis Lin
on 2017-07-18 16:33:41 UTC
(
hide
)
Description:
mosquitto patch
Filename:
MIME Type:
Creator:
Iblis Lin
Created:
2017-07-18 16:33:41 UTC
Size:
1.94 KB
patch
obsolete
>diff --git a/net/mosquitto/files/patch-lib_mosquitto__internal.h b/net/mosquitto/files/patch-lib_mosquitto__internal.h >new file mode 100644 >index 000000000000..1f99124cebc8 >--- /dev/null >+++ b/net/mosquitto/files/patch-lib_mosquitto__internal.h >@@ -0,0 +1,33 @@ >+--- lib/mosquitto_internal.h.orig 2017-07-18 16:25:21 UTC >++++ lib/mosquitto_internal.h >+@@ -30,11 +30,7 @@ Contributors: >+ #endif >+ #include <stdlib.h> >+ >+-#if defined(WITH_THREADING) && !defined(WITH_BROKER) >+-# include <pthread.h> >+-#else >+-# include <dummypthread.h> >+-#endif >++#include <pthread.h> >+ >+ #ifdef WITH_SRV >+ # include <ares.h> >+@@ -184,7 +180,7 @@ struct mosquitto { >+ #endif >+ bool want_write; >+ bool want_connect; >+-#if defined(WITH_THREADING) && !defined(WITH_BROKER) >++ >+ pthread_mutex_t callback_mutex; >+ pthread_mutex_t log_callback_mutex; >+ pthread_mutex_t msgtime_mutex; >+@@ -195,7 +191,7 @@ struct mosquitto { >+ pthread_mutex_t out_message_mutex; >+ pthread_mutex_t mid_mutex; >+ pthread_t thread_id; >+-#endif >++ >+ bool clean_session; >+ #ifdef WITH_BROKER >+ bool is_dropping; >diff --git a/net/mosquitto/files/patch-src_CMakeLists.txt b/net/mosquitto/files/patch-src_CMakeLists.txt >index 95e2e0a49cbe..1b7c83cab29e 100644 >--- a/net/mosquitto/files/patch-src_CMakeLists.txt >+++ b/net/mosquitto/files/patch-src_CMakeLists.txt >@@ -1,6 +1,14 @@ >---- src/CMakeLists.txt.orig 2015-05-07 13:21:22 UTC >+--- src/CMakeLists.txt.orig 2016-08-17 11:05:14 UTC > +++ src/CMakeLists.txt >-@@ -86,7 +86,7 @@ if (UNIX) >+@@ -77,6 +77,7 @@ if (WIN32 OR CYGWIN) >+ endif (WIN32 OR CYGWIN) >+ >+ add_definitions (-DWITH_BROKER) >++add_definitions (-DWITH_THREADING) >+ >+ add_executable(mosquitto ${MOSQ_SRCS}) >+ >+@@ -86,7 +87,7 @@ if (UNIX) > if (APPLE) > set (MOSQ_LIBS ${MOSQ_LIBS} dl m) > else (APPLE) >@@ -9,7 +17,7 @@ > endif (APPLE) > endif (UNIX) > >-@@ -127,6 +127,5 @@ if (${WITH_TLS} STREQUAL ON) >+@@ -127,6 +128,5 @@ if (${WITH_TLS} STREQUAL ON) > endif (${WITH_TLS} STREQUAL ON) > > if (UNIX)
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Flags:
joe:
maintainer-approval+
Actions:
View
|
Diff
Attachments on
bug 220827
: 184476 |
184667