generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-11-04 12:17:39 +01:00
Code Issues Projects Releases Wiki Activity

Android Things 1.06 with Termux changes (#3312)

Browse Source 
* include atomic when needed

* update for tipc

* moved check under android

* added license
This commit is contained in:
brubakerjeff
2018-11-23 14:27:57 -05:00
committed by Luca Boccassi
parent 1bb0d63f1e
commit d98325160f
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
RELICENSE/jeffbrubaker.md Normal file
View File

@@ -0,0 +1,14 @@
# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
This is a statement by Simon Giesecke that grants permission to
relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
Mozilla Public License v2 (MPLv2) or any other Open Source Initiative
approved license chosen by the current ZeroMQ BDFL (Benevolent
Dictator for Life).
A portion of the commits made by the Github handle "sigiesec", with
commit author "Simon Giesecke <simon.giesecke@btc-ag.com>", are
copyright of Simon Giesecke. This document hereby grants the libzmq
project team to relicense libzmq, including all past, present and
future contributions of the author listed above.
Jeff Brubaker
2018/11/18

3
configure.ac
View File

@@ -89,6 +89,7 @@ fi
# Check whether to build a with debug symbols # Check whether to build a with debug symbols
LIBZMQ_CHECK_ENABLE_DEBUG LIBZMQ_CHECK_ENABLE_DEBUG
# Check whether to enable code coverage # Check whether to enable code coverage
LIBZMQ_WITH_GCOV LIBZMQ_WITH_GCOV
@@ -108,6 +109,7 @@ AC_RUN_IFELSE(
memset(&topsrv, 0, sizeof(topsrv)); memset(&topsrv, 0, sizeof(topsrv));
topsrv.family = AF_TIPC; topsrv.family = AF_TIPC;
topsrv.addrtype = TIPC_ADDR_NAME; topsrv.addrtype = TIPC_ADDR_NAME;
topsrv.addr.name.domain = tipc_addr (10, 10, 10);
topsrv.addr.name.name.type = TIPC_TOP_SRV; topsrv.addr.name.name.type = TIPC_TOP_SRV;
topsrv.addr.name.name.instance = TIPC_TOP_SRV; topsrv.addr.name.name.instance = TIPC_TOP_SRV;
fcntl(sd, F_SETFL, O_NONBLOCK); fcntl(sd, F_SETFL, O_NONBLOCK);
@@ -193,6 +195,7 @@ case "${host_os}" in
case "${host_os}" in case "${host_os}" in
*android*) *android*)
AC_DEFINE(ZMQ_HAVE_ANDROID, 1, [Have Android OS]) AC_DEFINE(ZMQ_HAVE_ANDROID, 1, [Have Android OS])
AC_CHECK_LIB([atomic],[__atomic_load_4],[LIBS="${LIBS} -latomic"])
libzmq_on_android="yes" libzmq_on_android="yes"
;; ;;
esac esac