From abdc4f99a429bdd91f4013a0dd4c1db1fe664ed2e07a99849784c3643ddc640e Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Wed, 22 Jan 2020 10:26:26 +0000 Subject: [PATCH] Accepting request 766087 from home:Guillaume_G:branches:openSUSE:Factory:ARM - Fix build for aarch64/ppc64le (do not update config.sub file for libbacktrace) OBS-URL: https://build.opensuse.org/request/show/766087 OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=797 --- MozillaFirefox.changes | 6 ++++++ MozillaFirefox.spec | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index 54e795a..3cb01ac 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jan 21 12:59:54 UTC 2020 - Guillaume GARDET + +- Fix build for aarch64/ppc64le (do not update config.sub file + for libbacktrace) + ------------------------------------------------------------------- Wed Jan 8 08:19:12 UTC 2020 - Wolfgang Rosenauer diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index d663c02..e482781 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -324,8 +324,14 @@ cd $RPM_BUILD_DIR/%{srcname}-%{orig_version} %patch101 -p1 %patch102 -p1 %endif # only_print_mozconfig +# Save config.sub to restore it (for aarch64/ppc64le) later, as it is checked with a checksum +cp ./third_party/rust/backtrace-sys/src/libbacktrace/config.sub ./third_party/rust/backtrace-sys/src/libbacktrace/config.sub.save +cp ./third_party/rust/backtrace-sys/src/libbacktrace/config.guess ./third_party/rust/backtrace-sys/src/libbacktrace/config.guess.save %build +# Restore config.sub file +mv ./third_party/rust/backtrace-sys/src/libbacktrace/config.sub.save ./third_party/rust/backtrace-sys/src/libbacktrace/config.sub +mv ./third_party/rust/backtrace-sys/src/libbacktrace/config.guess.save ./third_party/rust/backtrace-sys/src/libbacktrace/config.guess %if !%{with only_print_mozconfig} # no need to add build time to binaries modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")"