summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve McIntyre <steve@einval.com>2023-01-22 14:02:25 +0000
committerSteve McIntyre <steve@einval.com>2023-01-22 14:05:16 +0000
commit65f161eefe0693635e292a76ab794a6ed8bb0b80 (patch)
tree1c403bb1cdb7e2f5cd9a1db1882d7a7214607c38
parentb61b8af886e45e41b69b90cf04cece3449d7a889 (diff)
downloadefi-boot-shim-65f161eefe0693635e292a76ab794a6ed8bb0b80.tar.gz
efi-boot-shim-65f161eefe0693635e292a76ab794a6ed8bb0b80.zip
Switch to using gcc-12
Closes: #1022180
-rw-r--r--debian/changelog1
-rw-r--r--debian/control2
-rwxr-xr-xdebian/rules2
3 files changed, 3 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 0f39a325..2f7f6ec2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ shim (15.7-1) UNRELEASED; urgency=medium
* New upstream release fixing more bugs
* Add a further patch from upstream:
+ Make sbat_var.S parse right with buggy gcc/binutils
+ * Switch to using gcc-12. Closes: #1022180
-- Steve McIntyre <93sam@debian.org> Sun, 22 Jan 2023 13:12:14 +0000
diff --git a/debian/control b/debian/control
index 1526125c..6127d7dc 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends: debhelper-compat (= 12),
sbsigntool,
openssl,
libelf-dev,
- gcc-10,
+ gcc-12,
dos2unix,
pesign (>= 0.112-5),
xxd,
diff --git a/debian/rules b/debian/rules
index 6228fcca..c630fa71 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,7 +45,7 @@ COMMON_OPTIONS += \
VENDOR_DBX_FILE=$(DBX_LIST) \
EFIDIR=$(distributor) \
CROSS_COMPILE=$(DEB_HOST_GNU_TYPE)- \
- CC=$(DEB_HOST_GNU_TYPE)-gcc-10 \
+ CC=$(DEB_HOST_GNU_TYPE)-gcc-12 \
$(NULL)
$(DBX_LIST): $(DBX_HASHES)