Build using gcc-7

To get better control of reproducibility during the lifetime of
Buster

diff --git a/debian/changelog b/debian/changelog
index d4e6dceb871fd8dc6fc8e39fe5a1c34564abc85e..396351b4af20190167af077294a431d039c496d8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ shim (15+1533136590.3beb971-7) UNRELEASED; urgency=medium
     + VLogError(): Avoid NULL pointer dereferences in (V)Sprint calls
     + Fix OBJ_create() to tolerate a NULL sn and ln
   * Update VCS-* fields in debian/control
+  * Build using gcc-7 to get better control of reproducibility during the
+    lifetime of Buster.
 
  -- Steve McIntyre <93sam@debian.org>  Fri, 03 May 2019 01:39:34 +0100
 

diff --git a/debian/control b/debian/control
index 8ee1560a39a85218fbeda296ce604dfc4ec954b5..dfad5e2fff5a4476fa82e22ed04f8d5f6803043e 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian EFI team <debian-efi@lists.debian.org>
 Uploaders: Steve Langasek <vorlon@debian.org>, Steve McIntyre <93sam@debian.org>
 Standards-Version: 4.3.0
-Build-Depends: debhelper (>= 9), gnu-efi (>= 3.0u), sbsigntool, openssl, libelf-dev
+Build-Depends: debhelper (>= 9), gnu-efi (>= 3.0u), sbsigntool, openssl, libelf-dev, gcc-7
 Vcs-Browser: https://salsa.debian.org/efi-team/shim
 Vcs-Git: https://salsa.debian.org/efi-team/shim.git
 

diff --git a/debian/rules b/debian/rules
index daaed62e935d1fc1602079a486fc711103cc0a6d..0f125340f64cf4fced6a88420e9e231dc55e2fb9 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -36,6 +36,7 @@ COMMON_OPTIONS += \
        VENDOR_CERT_FILE=$(cert) \
        EFIDIR=$(distributor) \
        CROSS_COMPILE=$(DEB_HOST_GNU_TYPE)- \
+       CC=$(DEB_HOST_GNU_TYPE)-gcc-7 \
        $(NULL)
 
 %: