libzmq: Fix build by disabling libunwind&update

This commit is contained in:
Fredrik Fornwall 2017-03-23 10:34:38 +01:00
parent faf5213903
commit 5926544240
2 changed files with 27 additions and 2 deletions

View File

@ -1,7 +1,11 @@
TERMUX_PKG_HOMEPAGE=http://zeromq.org/
TERMUX_PKG_DESCRIPTION="Fast messaging system built on sockets. C and C++ bindings. aka 0MQ, ZMQ."
TERMUX_PKG_VERSION=4.2.1
TERMUX_PKG_VERSION=4.2.2
TERMUX_PKG_SRCURL=https://github.com/zeromq/libzmq/releases/download/v${TERMUX_PKG_VERSION}/zeromq-${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=27d1e82a099228ee85a7ddb2260f40830212402c605a4a10b5e5498a7e0e9d03
TERMUX_PKG_SHA256=5b23f4ca9ef545d5bd3af55d305765e3ee06b986263b31967435d285a3e6df6b
TERMUX_PKG_DEPENDS="libsodium"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-libsodium"
termux_step_post_extract_package() {
./autogen.sh
}

View File

@ -0,0 +1,21 @@
diff -u -r ../zeromq-4.2.2/configure.ac ./configure.ac
--- ../zeromq-4.2.2/configure.ac 2017-02-18 19:05:37.000000000 +0100
+++ ./configure.ac 2017-03-23 10:31:34.501893021 +0100
@@ -653,17 +653,6 @@
AC_SUBST(pkg_config_defines, "")
fi
-PKG_CHECK_MODULES(LIBUNWIND, [libunwind],
- [
- AC_DEFINE(HAVE_LIBUNWIND, 1, [The libunwind library is to be used])
- AC_SUBST([LIBUNWIND_CFLAGS])
- AC_SUBST([LIBUNWIND_LIBS])
- AC_CHECK_LIB([dl], [dladdr])
- ],
- [
- AC_MSG_WARN([Cannot find libunwind])
- ])
-
# Subst LIBZMQ_EXTRA_CFLAGS & CXXFLAGS & LDFLAGS
AC_SUBST(LIBZMQ_EXTRA_CFLAGS)
AC_SUBST(LIBZMQ_EXTRA_CXXFLAGS)