Merge branch 'master' into f28
This commit is contained in:
commit
491f1538b0
@ -15,8 +15,8 @@ ac_add_options --enable-pulseaudio
|
||||
ac_add_options --with-system-icu
|
||||
ac_add_options --with-mozilla-api-keyfile=../mozilla-api-key
|
||||
ac_add_options --with-google-api-keyfile=../google-api-key
|
||||
ac_add_options --enable-release
|
||||
ac_add_options --enable-pie
|
||||
ac_add_options --enable-release
|
||||
ac_add_options --update-channel=release
|
||||
# Workaround for mozbz#1341234
|
||||
ac_add_options BINDGEN_CFLAGS="$(pkg-config nspr pixman-1 --cflags)"
|
||||
|
13
firefox.spec
13
firefox.spec
@ -6,7 +6,7 @@
|
||||
%global system_libicu 0
|
||||
%global hardened_build 1
|
||||
%global system_jpeg 1
|
||||
%global build_with_clang 1
|
||||
%global build_with_clang 0
|
||||
|
||||
%if 0%{?fedora} > 29
|
||||
%global wayland_backend_default 1
|
||||
@ -199,6 +199,9 @@ BuildRequires: llvm
|
||||
BuildRequires: llvm-devel
|
||||
BuildRequires: clang
|
||||
BuildRequires: clang-libs
|
||||
%if %{?build_with_clang}
|
||||
BuildRequires: lld
|
||||
%endif
|
||||
%if 0%{?fedora} > 27
|
||||
BuildRequires: pipewire-devel
|
||||
%endif
|
||||
@ -561,7 +564,11 @@ export LIBDIR='%{_libdir}'
|
||||
%if %{?build_with_clang}
|
||||
export CC=clang
|
||||
export CXX=clang++
|
||||
export LINKER=lld-link
|
||||
export LLVM_PROFDATA="llvm-profdata"
|
||||
export AR="llvm-ar"
|
||||
export NM="llvm-nm"
|
||||
export RANLIB="llvm-ranlib"
|
||||
echo "ac_add_options --enable-linker=lld" >> .mozconfig
|
||||
%endif
|
||||
|
||||
MOZ_SMP_FLAGS=-j1
|
||||
@ -920,7 +927,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
|
||||
%changelog
|
||||
* Tue Nov 13 2018 Martin Stransky <stransky@redhat.com> - 63.0.1-6
|
||||
- Build with clang/llvm
|
||||
- Added an option to build with clang/llvm.
|
||||
|
||||
* Tue Nov 6 2018 Martin Stransky <stransky@redhat.com> - 63.0.1-5
|
||||
- Added fix for mozbz#1502457- disable Contextual Feature
|
||||
|
Loading…
Reference in New Issue
Block a user