From 3a0f45ea1eefd26cf328966249bdb3ecc17af1b0 Mon Sep 17 00:00:00 2001 From: Dario Lombardo Date: Mon, 1 Oct 2018 13:58:24 +0200 Subject: [PATCH] debian: add libsystemd-journal-dev as alternative. Required for building on ubuntu 14.04. Change-Id: I2ebdceb1c73d093458adc05cf38629ac0b50c9e4 Reviewed-on: https://code.wireshark.org/review/29990 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs --- debian/control | 2 +- tools/debian-setup.sh | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 71aa44305e..e952eaba20 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,7 @@ Build-Depends: lsb-release, # backports-compatible. libgnutls28-dev (>= 3.2.14-1~) | libgnutls-dev, libgcrypt-dev, libkrb5-dev, liblua5.2-dev, libsmi2-dev, - libmaxminddb-dev, dpkg-dev (>= 1.16.1~), libsystemd-dev, + libmaxminddb-dev, dpkg-dev (>= 1.16.1~), libsystemd-dev | libsystemd-journal-dev, libnl-genl-3-dev [linux-any], libnl-route-3-dev [linux-any], asciidoctor, cmake (>= 3.5) | cmake3, libsbc-dev, libnghttp2-dev, libssh-gcrypt-dev, liblz4-dev, libsnappy-dev, libspandsp-dev, libxml2-dev diff --git a/tools/debian-setup.sh b/tools/debian-setup.sh index 42d9102905..10570f71e2 100755 --- a/tools/debian-setup.sh +++ b/tools/debian-setup.sh @@ -128,6 +128,12 @@ echo "libgnutls28-dev and libgnutls-dev are unavailable" >&2 add_package ADDITIONAL_LIST libmaxminddb-dev || echo "libmaxminddb-dev is unavailable" >&2 +# libsystemd-journal-dev: Ubuntu 14.04 +# libsystemd-dev: Ubuntu >= 16.04 +add_package DEBDEPS_LIST libsystemd-dev || +add_package DEBDEPS_LIST libsystemd-journal-dev || +echo "libsystemd-dev is unavailable" + ACTUAL_LIST=$BASIC_LIST # Now arrange for optional support libraries