diff options
| author | Jan Horak <jhorak@redhat.com> | 2018-09-27 14:37:10 +0200 |
|---|---|---|
| committer | Jan Horak <jhorak@redhat.com> | 2018-09-27 14:37:10 +0200 |
| commit | 13bd23eb722409af4227777cb74200e5eb3a973e (patch) | |
| tree | 915abc91c58c1a2eb00cc2d38bb55874e4ed9d2f | |
| parent | Disable elfhack for fedora 29+ because of build failures (diff) | |
| download | librewolf-fedora-ff-13bd23eb722409af4227777cb74200e5eb3a973e.tar.gz librewolf-fedora-ff-13bd23eb722409af4227777cb74200e5eb3a973e.tar.bz2 librewolf-fedora-ff-13bd23eb722409af4227777cb74200e5eb3a973e.zip | |
Disable elfhack for fedora 29+ because of build failures
| -rw-r--r-- | build-disable-elfhack.patch | 12 | ||||
| -rw-r--r-- | firefox.spec | 13 |
2 files changed, 22 insertions, 3 deletions
diff --git a/build-disable-elfhack.patch b/build-disable-elfhack.patch new file mode 100644 index 0000000..11e6a54 --- /dev/null +++ b/build-disable-elfhack.patch @@ -0,0 +1,12 @@ +diff -up firefox-62.0.2/toolkit/moz.configure.elfhack firefox-62.0.2/toolkit/moz.configure +--- firefox-62.0.2/toolkit/moz.configure.elfhack 2018-09-27 14:32:56.549507561 +0200 ++++ firefox-62.0.2/toolkit/moz.configure 2018-09-27 14:33:08.219532121 +0200 +@@ -1195,7 +1195,7 @@ with only_when(has_elfhack): + option('--disable-elf-hack', help='Disable elf hacks') + + set_config('USE_ELF_HACK', +- depends_if('--enable-elf-hack')(lambda _: True)) ++ depends_if('--enable-elf-hack')(lambda _: False)) + + + @depends(check_build_environment) diff --git a/firefox.spec b/firefox.spec index 07eb4cc..1a635cf 100644 --- a/firefox.spec +++ b/firefox.spec @@ -43,6 +43,12 @@ # Build as a debug package? %global debug_build 0 +%global disable_elfhack 0 +%if 0%{?fedora} > 28 +%global disable_elfhack 1 +%endif + + %global default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html %global firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} # Minimal required versions @@ -120,6 +126,7 @@ Patch37: build-jit-atomic-always-lucky.patch # Fixing missing cacheFlush when JS_CODEGEN_NONE is used (s390x) Patch38: build-cacheFlush-missing.patch Patch40: build-aarch64-skia.patch +Patch41: build-disable-elfhack.patch # Fedora specific patches Patch215: firefox-enable-addons.patch @@ -302,6 +309,9 @@ This package contains results of tests executed during build. %endif %patch37 -p1 -b .jit-atomic-lucky %patch40 -p1 -b .aarch64-skia +%if 0%{?disable_elfhack} +%patch41 -p1 -b .disable-elfhack +%endif %patch3 -p1 -b .arm # Fedora patches @@ -377,9 +387,6 @@ echo "ac_add_options --enable-system-ffi" >> .mozconfig %ifarch %{arm} echo "ac_add_options --disable-elf-hack" >> .mozconfig %endif -%if 0%{?fedora} > 28 -echo "ac_add_options --disable-elf-hack" >> .mozconfig -%endif %if %{?debug_build} echo "ac_add_options --enable-debug" >> .mozconfig |