Disable elfhack for fedora 29+ because of build failures

This commit is contained in:
Jan Horak 2018-09-27 14:37:10 +02:00
parent 096e14bbcb
commit 13bd23eb72
2 changed files with 22 additions and 3 deletions

View File

@ -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)

View File

@ -43,6 +43,12 @@
# Build as a debug package? # Build as a debug package?
%global debug_build 0 %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 default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html
%global firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} %global firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
# Minimal required versions # Minimal required versions
@ -120,6 +126,7 @@ Patch37: build-jit-atomic-always-lucky.patch
# Fixing missing cacheFlush when JS_CODEGEN_NONE is used (s390x) # Fixing missing cacheFlush when JS_CODEGEN_NONE is used (s390x)
Patch38: build-cacheFlush-missing.patch Patch38: build-cacheFlush-missing.patch
Patch40: build-aarch64-skia.patch Patch40: build-aarch64-skia.patch
Patch41: build-disable-elfhack.patch
# Fedora specific patches # Fedora specific patches
Patch215: firefox-enable-addons.patch Patch215: firefox-enable-addons.patch
@ -302,6 +309,9 @@ This package contains results of tests executed during build.
%endif %endif
%patch37 -p1 -b .jit-atomic-lucky %patch37 -p1 -b .jit-atomic-lucky
%patch40 -p1 -b .aarch64-skia %patch40 -p1 -b .aarch64-skia
%if 0%{?disable_elfhack}
%patch41 -p1 -b .disable-elfhack
%endif
%patch3 -p1 -b .arm %patch3 -p1 -b .arm
# Fedora patches # Fedora patches
@ -377,9 +387,6 @@ echo "ac_add_options --enable-system-ffi" >> .mozconfig
%ifarch %{arm} %ifarch %{arm}
echo "ac_add_options --disable-elf-hack" >> .mozconfig echo "ac_add_options --disable-elf-hack" >> .mozconfig
%endif %endif
%if 0%{?fedora} > 28
echo "ac_add_options --disable-elf-hack" >> .mozconfig
%endif
%if %{?debug_build} %if %{?debug_build}
echo "ac_add_options --enable-debug" >> .mozconfig echo "ac_add_options --enable-debug" >> .mozconfig