From 4b6e091f062501838ae50892e775ecda0ae437ef Mon Sep 17 00:00:00 2001 From: Andrej Shadura <andrew.shadura@collabora.co.uk> Date: Thu, 12 Sep 2019 12:50:53 +0200 Subject: [PATCH] =?UTF-8?q?Don=E2=80=99t=20build=20against=20libdw,=20sinc?= =?UTF-8?q?e=200.158=20isn=E2=80=99t=20available=20in=20target?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andrej Shadura <andrew.shadura@collabora.co.uk> --- debian/changelog | 6 ++++++ debian/control | 2 +- debian/rules | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index f8b65fe9..91eae909 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +systemd (241-7~deb10u1co2) apertis; urgency=medium + + * Don’t build against libdw, since 0.158 isn’t available in target. + + -- Andrej Shadura <andrewsh@debian.org> Thu, 12 Sep 2019 12:50:38 +0200 + systemd (241-7~deb10u1co1) apertis; urgency=medium * Merge from Debian. Remaining changes: diff --git a/debian/control b/debian/control index 44c61557..03940dea 100644 --- a/debian/control +++ b/debian/control @@ -45,7 +45,7 @@ Build-Depends: debhelper (>= 10.4~), libblkid-dev (>= 2.24), libmount-dev (>= 2.30), libseccomp-dev (>= 2.3.1) [amd64 arm64 armel armhf i386 mips mipsel mips64 mips64el x32 powerpc ppc64 ppc64el s390x], - libdw-dev (>= 0.158) <!stage1>, +# libdw-dev (>= 0.158) <!stage1>, libpolkit-gobject-1-dev <!stage1>, linux-base <!nocheck>, acl <!nocheck>, diff --git a/debian/rules b/debian/rules index 96ae1179..29fb0c8b 100755 --- a/debian/rules +++ b/debian/rules @@ -99,7 +99,7 @@ CONFFLAGS_deb += \ -Daudit=true \ -Dlibcryptsetup=true \ -Dcoredump=true \ - -Delfutils=true \ + -Delfutils=false \ -Dapparmor=true \ -Dlibidn=true \ -Dlibiptc=true \ -- GitLab