Skip to content

Commit

Permalink
Android Things 1.06 with Termux changes (zeromq#3312)
Browse files Browse the repository at this point in the history
* include atomic when needed

* update for tipc

* moved check under android

* added license
  • Loading branch information
brubakerjeff authored and MohammadAlTurany committed Jan 28, 2019
1 parent 96c690c commit ea0e7da
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 1 deletion.
14 changes: 14 additions & 0 deletions RELICENSE/jeffbrubaker.md
Original file line number Diff line number Diff line change
@@ -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
5 changes: 4 additions & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ fi
# Check whether to build a with debug symbols
LIBZMQ_CHECK_ENABLE_DEBUG


# Check whether to enable code coverage
LIBZMQ_WITH_GCOV

Expand All @@ -108,6 +109,7 @@ AC_RUN_IFELSE(
memset(&topsrv, 0, sizeof(topsrv));
topsrv.family = AF_TIPC;
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.instance = TIPC_TOP_SRV;
fcntl(sd, F_SETFL, O_NONBLOCK);
Expand Down Expand Up @@ -193,7 +195,8 @@ case "${host_os}" in
case "${host_os}" in
*android*)
AC_DEFINE(ZMQ_HAVE_ANDROID, 1, [Have Android OS])
libzmq_on_android="yes"
AC_CHECK_LIB([atomic],[__atomic_load_4],[LIBS="${LIBS} -latomic"])
libzmq_on_android="yes"
;;
esac
;;
Expand Down

0 comments on commit ea0e7da

Please sign in to comment.