From 241323a97ea93080eb621cfc0e6fee83067b7a60 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Thu, 1 Feb 2018 11:27:20 +0100 Subject: [PATCH 1/1] libzmq: Update from 4.2.2 to 4.2.3 --- packages/libzmq/build.sh | 7 +++---- packages/libzmq/configure.ac.patch | 21 --------------------- 2 files changed, 3 insertions(+), 25 deletions(-) delete mode 100644 packages/libzmq/configure.ac.patch diff --git a/packages/libzmq/build.sh b/packages/libzmq/build.sh index f8e5ed58..8ed73bd1 100644 --- a/packages/libzmq/build.sh +++ b/packages/libzmq/build.sh @@ -1,11 +1,10 @@ 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.2 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_VERSION=4.2.3 +TERMUX_PKG_SHA256=8f1e2b2aade4dbfde98d82366d61baef2f62e812530160d2e6d0a5bb24e40bc0 TERMUX_PKG_SRCURL=https://github.com/zeromq/libzmq/releases/download/v${TERMUX_PKG_VERSION}/zeromq-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=5b23f4ca9ef545d5bd3af55d305765e3ee06b986263b31967435d285a3e6df6b TERMUX_PKG_DEPENDS="libsodium" -TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-libsodium" +TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-libsodium --disable-libunwind" termux_step_post_extract_package() { ./autogen.sh diff --git a/packages/libzmq/configure.ac.patch b/packages/libzmq/configure.ac.patch deleted file mode 100644 index db9fbbf6..00000000 --- a/packages/libzmq/configure.ac.patch +++ /dev/null @@ -1,21 +0,0 @@ -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) -- 2.11.0