On Tue, 2015-09-15 at 23:01 +0200, Michael Biebl wrote: > Am 14.09.2015 um 15:54 schrieb Luca Boccassi: > > > > Hi Michael, > > > > This patch has been reviewed, accepted and merged upstream: > > https://github.com/rsyslog/rsyslog/pull/512 > > > > Did you give more thoughts to enabling this feature? As I wrote, I'm > > happy to do my best and provide support. I've already sent a few more > > patches upstream. > > I've applied your two patches [1][2] and released the package as 8.12.0-2 > > Thanks again for your work.
Hello Michael, I just realised that CZMQ is not available on all the architectures in sid due to missing dependencies [1]. Specifically, there is no build for: hurd-i386, m68k, powerpcspe, sh4. Attached is a patch to stop building the im/omczmq plugins and the rsyslog-czmq package for those architectures. I should have realised immediately, I am really sorry. Kind regards, Luca Boccassi [1] https://buildd.debian.org/status/package.php?p=czmq&suite=sid From 755010930b91183811f026b7a48f58c4e5da0bef Mon Sep 17 00:00:00 2001 From: Luca Boccassi <luca.bocca...@gmail.com> Date: Wed, 16 Sep 2015 23:03:01 +0100 Subject: [PATCH] Disable czmq on hurd-i386, m68k, powerpcspe, sh4 libczmq-dev is not available on hurd-i386, m68k, powerpcspe and sh4, so avoid building the rsyslog-czmq plugins and packages. --- debian/control | 4 ++-- debian/rules | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/debian/control b/debian/control index fc6e3e8..367eb07 100644 --- a/debian/control +++ b/debian/control @@ -19,7 +19,7 @@ Build-Depends: debhelper (>= 8), liblognorm-dev (>= 1.0.2), liblogging-stdlog-dev (>= 1.0.3), libjson-c-dev, - libczmq-dev, + libczmq-dev [!hurd-i386 !m68k !powerpcspe !sh4], uuid-dev, libsystemd-dev (>= 209) [linux-any], pkg-config, @@ -157,7 +157,7 @@ Description: RELP protocol support for rsyslog connection loss or if a peer becomes unavailable. Package: rsyslog-czmq -Architecture: any +Architecture: amd64 arm64 armel armhf i386 ia64 mips mipsel powerpc ppc64el s390x alpha hppa kfreebsd-amd64 kfreebsd-i386 mips64el ppc64 sparc64 x32 Priority: extra Depends: ${shlibs:Depends}, ${misc:Depends}, diff --git a/debian/rules b/debian/rules index 9a44614..050e553 100755 --- a/debian/rules +++ b/debian/rules @@ -4,6 +4,7 @@ DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/buildflags.mk DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) +DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) %: dh $@ --with autoreconf,systemd @@ -15,6 +16,11 @@ confflags += --enable-imptcp \ --enable-kmsg endif +ifeq (,$(filter $(DEB_HOST_ARCH),hurd-i386 m68k powerpcspe sh4)) +confflags += --enable-imczmq \ + --enable-omczmq +endif + override_dh_auto_configure: dh_auto_configure -- \ $(confflags) \ @@ -43,8 +49,6 @@ override_dh_auto_configure: --enable-mmutf8fix \ --enable-mmpstrucdata \ --enable-mmsequence \ - --enable-imczmq \ - --enable-omczmq \ --disable-libgcrypt \ --enable-testbench \ --enable-imdiag \ -- 2.1.4
signature.asc
Description: This is a digitally signed message part
