From 5926544240bc06a9a66783e3bec9abdbd718a5e9 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Thu, 23 Mar 2017 10:34:38 +0100 Subject: [PATCH] libzmq: Fix build by disabling libunwind&update --- packages/libzmq/build.sh | 8 ++++++-- packages/libzmq/configure.ac.patch | 21 +++++++++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 packages/libzmq/configure.ac.patch diff --git a/packages/libzmq/build.sh b/packages/libzmq/build.sh index e5ee5e8e5..bf7951305 100644 --- a/packages/libzmq/build.sh +++ b/packages/libzmq/build.sh @@ -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 +} diff --git a/packages/libzmq/configure.ac.patch b/packages/libzmq/configure.ac.patch new file mode 100644 index 000000000..db9fbbf67 --- /dev/null +++ b/packages/libzmq/configure.ac.patch @@ -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)