diff options
| -rw-r--r-- | build-disable-multijobs-rust.patch | 14 | ||||
| -rw-r--r-- | firefox.spec | 9 |
2 files changed, 22 insertions, 1 deletions
diff --git a/build-disable-multijobs-rust.patch b/build-disable-multijobs-rust.patch new file mode 100644 index 0000000..82da56b --- /dev/null +++ b/build-disable-multijobs-rust.patch @@ -0,0 +1,14 @@ +diff --git a/config/makefiles/rust.mk b/config/makefiles/rust.mk +--- a/config/makefiles/rust.mk ++++ b/config/makefiles/rust.mk +@@ -10,6 +10,10 @@ + # commands can be executed directly by make, without doing a round-trip + # through a shell. + ++MOZ_MAKE_FLAGS := $(filter-out -j%,$(MAKEFLAGS)) ++MAKEFLAGS += -j1 ++ ++ + cargo_host_flag := --target=$(RUST_HOST_TARGET) + cargo_target_flag := --target=$(RUST_TARGET) + diff --git a/firefox.spec b/firefox.spec index e9cfd7a..295800f 100644 --- a/firefox.spec +++ b/firefox.spec @@ -89,8 +89,13 @@ ExcludeArch: s390x Summary: Mozilla Firefox Web browser Name: firefox +<<<<<<< HEAD +Version: 68.0.1 +Release: 4%{?pre_tag}%{?dist} +======= Version: 68.0.2 Release: 1%{?pre_tag}%{?dist} +>>>>>>> master URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz @@ -127,6 +132,7 @@ Patch38: build-cacheFlush-missing.patch Patch40: build-aarch64-skia.patch Patch41: build-disable-elfhack.patch Patch44: build-arm-libopus.patch +Patch45: build-disable-multijobs-rust.patch # Fedora specific patches Patch215: firefox-enable-addons.patch @@ -200,7 +206,6 @@ BuildRequires: cbindgen %endif BuildRequires: nodejs BuildRequires: nasm >= 1.13 -BuildRequires: strace Requires: mozilla-filesystem Requires: p11-kit-trust @@ -326,6 +331,7 @@ This package contains results of tests executed during build. %endif %patch3 -p1 -b .arm %patch44 -p1 -b .build-arm-libopus +%patch45 -p1 -b .build-disable-multijobs-rust # Patch for big endian platforms only %if 0%{?big_endian} %patch26 -p1 -b .icu @@ -936,6 +942,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : * Mon Aug 5 2019 Jan Horak <jhorak@redhat.com> - 68.0.1-3 - Added workaround fix for webrtc indicator +- Added rust build workaround * Wed Jul 24 2019 Martin Stransky <stransky@redhat.com> - 68.0.1-2 - Added fix for rhbz#1709840 |