From 6c3a73bbbc5c27267811f1c9cf957813b592caebe06ede6be03f0cfce61b68f8 Mon Sep 17 00:00:00 2001 From: Matthias Eliasson Date: Wed, 25 Jan 2023 19:08:09 +0000 Subject: [PATCH] Accepting request 1060977 from home:Guillaume_G:branches:openSUSE:Factory:ARM - Add back the config.guess/config.sub workaround for aarch64, ppc64le and riscv64, which was silently dropped from previous commit. OBS-URL: https://build.opensuse.org/request/show/1060977 OBS-URL: https://build.opensuse.org/package/show/X11:terminals/alacritty?expand=0&rev=62 --- alacritty.changes | 7 +++++++ alacritty.spec | 9 +++++++++ 2 files changed, 16 insertions(+) diff --git a/alacritty.changes b/alacritty.changes index b8b8aab..e35dcef 100644 --- a/alacritty.changes +++ b/alacritty.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Jan 25 16:15:25 UTC 2023 - Guillaume GARDET + +- Add back the config.guess/config.sub workaround for aarch64, + ppc64le and riscv64, which was silently dropped from previous + commit. + ------------------------------------------------------------------- Wed Dec 07 21:22:40 UTC 2022 - Soc Virnyl Estela diff --git a/alacritty.spec b/alacritty.spec index e9bf569..8b46ba4 100644 --- a/alacritty.spec +++ b/alacritty.spec @@ -74,6 +74,15 @@ The official zsh completion script for alacritty. mkdir .cargo cp %{SOURCE2} .cargo/config +%ifarch aarch64 ppc64le riscv64 +# Remove checksum of config.guess and config.sub since aarch64 and ppc64le modify them +sed -i 's#"expat/conftools/config.guess":"ebaffe1c6683ae2c3dcabb87825a83b892f00391514756f7640c4a3dcafbad4f",##g' ./vendor/expat-sys/.cargo-checksum.json +sed -i 's#"expat/conftools/config.sub":"523cb028db907d1fbbcecdcac6737f9e2eeba48fb639231dbc5ae69238f276c9",##g' ./vendor/expat-sys/.cargo-checksum.json +%endif +%ifarch riscv64 +sed -i -e 's#"config.guess":"e0c1d7ef8ce964fb57c35e7704ae8661d7e4ca87d6a3c18950e503ae26b62319",##' -e 's#"config.sub":"f7e62c3cb15cd5bbc4e7f3617793b227481fc554d39697a9c322a266d20fb626",##' vendor/servo-fontconfig-sys/.cargo-checksum.json +%endif + %build RUSTFLAGS=%{rustflags} %{cargo_build}