debian/control: Fix build-dependency on openssl to work with new versions...

The new versions have Multi-Arch: allowed, and surprisingly dpkg doesn't
consider them to satisfy a dependency on openssl:native.  Change the
build-dependency into an alternative satisfiable by both old and new
versions. (Closes: #839145)

(cherry picked from commit 8e552ff10c)
This commit is contained in:
Ben Hutchings 2016-11-02 12:21:30 -06:00
parent 6159bcf693
commit 25e532ff97
2 changed files with 6 additions and 2 deletions

2
debian/changelog vendored
View File

@ -6,6 +6,8 @@ linux (4.9~rc3-1~exp1) UNRELEASED; urgency=medium
* [rt] Disable until it is updated for 4.9 or later
* kbuild: add -fno-PIE (Closes: #841368)
* Compile with gcc-6 on all architectures
* debian/control: Fix build-dependency on openssl to work with new
versions that have M-A: allowed (Closes: #839145)
-- Ben Hutchings <ben@decadent.org.uk> Sat, 29 Oct 2016 00:08:55 +0100

View File

@ -20,9 +20,11 @@ Build-Depends:
# used by upstream to build include/generated/timeconst.h
bc <!stage1>,
# used by upstream to build signing tools and to process certificates
# (the arch-qualification is a workaround for #827628 and #827633)
# - libssl-dev arch-qualification is a workaround for #827628 and #827633
libssl-dev:native <!stage1>, libssl-dev [linux-any] <!stage1 !pkg.linux.notools cross>,
openssl:native <!stage1>,
# - openssl needs to run on the host; need :native for older versions that do
# not have M-A: allowed but need unqualified name for newer versions
openssl (>= 1.1.0-1~) <!stage1> | openssl:native <!stage1>,
# used by upstream to build perf documentation
asciidoc <!stage1 !nodoc !pkg.linux.notools>,
xmlto <!stage1 !nodoc !pkg.linux.notools>,