From 3a3192e983d92f5b1bc27c128649f36828831657 Mon Sep 17 00:00:00 2001 From: Stephan Senkbeil Date: Fri, 13 Dec 2019 14:40:25 +0100 Subject: [PATCH 1/2] Adds RELICENSE for sonoware --- RELICENSE/sonoware.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 RELICENSE/sonoware.md diff --git a/RELICENSE/sonoware.md b/RELICENSE/sonoware.md new file mode 100644 index 00000000..255027ee --- /dev/null +++ b/RELICENSE/sonoware.md @@ -0,0 +1,13 @@ +# Permission to Relicense under MPLv2 + +This is a statement by sonoware GmbH that grants permission to relicense its +copyrights in the libzmq C++ library (ZeroMQ) under the Mozilla Public License +v2 (MPLv2). + +A portion of the commits made by the Github handle "sonoware", with commit author +"Stephan Senkbeil" are copyright of sonoware GmbH. +This document hereby grants the libzmq project team to relicense libzmq, including +all past, present and future contributions of the authors listed above. + +Stephan Senkbeil +2019/12/13 From 8089529148d53a57d2589bf7fdde648e54d58d0a Mon Sep 17 00:00:00 2001 From: Stephan Senkbeil Date: Fri, 13 Dec 2019 14:42:19 +0100 Subject: [PATCH 2/2] Problem: ZMQ_HAVE_PTHREAD_SET_AFFINITY not set correctly Solution: Set correct define in CMake check and add the cmakedefine --- builds/cmake/Modules/ZMQSourceRunChecks.cmake | 2 +- builds/cmake/platform.hpp.in | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/builds/cmake/Modules/ZMQSourceRunChecks.cmake b/builds/cmake/Modules/ZMQSourceRunChecks.cmake index 3e5268e7..98c9e5de 100644 --- a/builds/cmake/Modules/ZMQSourceRunChecks.cmake +++ b/builds/cmake/Modules/ZMQSourceRunChecks.cmake @@ -273,7 +273,7 @@ int main(int argc, char *argv []) return 0; } " - ZMQ_HAVE_PTHREAD_SETAFFINITY) + ZMQ_HAVE_PTHREAD_SET_AFFINITY) set(CMAKE_REQUIRED_FLAGS ${SAVE_CMAKE_REQUIRED_FLAGS}) endmacro() diff --git a/builds/cmake/platform.hpp.in b/builds/cmake/platform.hpp.in index 0bd9fcab..9f56575f 100644 --- a/builds/cmake/platform.hpp.in +++ b/builds/cmake/platform.hpp.in @@ -48,6 +48,7 @@ #cmakedefine ZMQ_HAVE_PTHREAD_SETNAME_2 #cmakedefine ZMQ_HAVE_PTHREAD_SETNAME_3 #cmakedefine ZMQ_HAVE_PTHREAD_SET_NAME +#cmakedefine ZMQ_HAVE_PTHREAD_SET_AFFINITY #cmakedefine HAVE_ACCEPT4 #cmakedefine HAVE_STRNLEN