summaryrefslogtreecommitdiff
path: root/firefox.spec
diff options
context:
space:
mode:
authorJan Horak <jhorak@redhat.com>2018-09-27 14:37:10 +0200
committerJan Horak <jhorak@redhat.com>2018-09-27 14:37:10 +0200
commit13bd23eb722409af4227777cb74200e5eb3a973e (patch)
tree915abc91c58c1a2eb00cc2d38bb55874e4ed9d2f /firefox.spec
parentDisable elfhack for fedora 29+ because of build failures (diff)
downloadlibrewolf-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
Diffstat (limited to 'firefox.spec')
-rw-r--r--firefox.spec13
1 files changed, 10 insertions, 3 deletions
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
bgstack15