diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2016-11-02 12:21:30 -0600 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2016-11-03 16:14:59 -0600 |
| commit | 25e532ff97db2fb2990e8b6e0fb74a9313255656 (patch) | |
| tree | 25b6a11bc0cd1d5665e86385a3f348852b0e7075 | |
| parent | 6159bcf6938b3ba211223e5069df460cb31c1347 (diff) | |
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 8e552ff10cc5c5864da8e14c0de2dbb6162f8a9f)
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/templates/control.source.in | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index f6102d561..a2215c4ee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 diff --git a/debian/templates/control.source.in b/debian/templates/control.source.in index 070db662a..a8bc9c1db 100644 --- a/debian/templates/control.source.in +++ b/debian/templates/control.source.in @@ -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>, |