rpms/firefox
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'master' into f28

Browse Source
This commit is contained in:
Martin Stransky 2018-11-13 23:48:36 +01:00
commit 491f1538b0
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firefox-mozconfig
View File

@ -15,8 +15,8 @@ ac_add_options --enable-pulseaudio
ac_add_options --with-system-icu ac_add_options --with-system-icu
ac_add_options --with-mozilla-api-keyfile=../mozilla-api-key ac_add_options --with-mozilla-api-keyfile=../mozilla-api-key
ac_add_options --with-google-api-keyfile=../google-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-pie
ac_add_options --enable-release
ac_add_options --update-channel=release ac_add_options --update-channel=release
# Workaround for mozbz#1341234 # Workaround for mozbz#1341234
ac_add_options BINDGEN_CFLAGS="$(pkg-config nspr pixman-1 --cflags)" ac_add_options BINDGEN_CFLAGS="$(pkg-config nspr pixman-1 --cflags)"

13
firefox.spec
View File

@ -6,7 +6,7 @@
%global system_libicu 0 %global system_libicu 0
%global hardened_build 1 %global hardened_build 1
%global system_jpeg 1 %global system_jpeg 1
%global build_with_clang 1 %global build_with_clang 0
%if 0%{?fedora} > 29 %if 0%{?fedora} > 29
%global wayland_backend_default 1 %global wayland_backend_default 1
@ -199,6 +199,9 @@ BuildRequires: llvm
BuildRequires: llvm-devel BuildRequires: llvm-devel
BuildRequires: clang BuildRequires: clang
BuildRequires: clang-libs BuildRequires: clang-libs
%if %{?build_with_clang}
BuildRequires: lld
%endif
%if 0%{?fedora} > 27 %if 0%{?fedora} > 27
BuildRequires: pipewire-devel BuildRequires: pipewire-devel
%endif %endif
@ -561,7 +564,11 @@ export LIBDIR='%{_libdir}'
%if %{?build_with_clang} %if %{?build_with_clang}
export CC=clang export CC=clang
export CXX=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 %endif
MOZ_SMP_FLAGS=-j1 MOZ_SMP_FLAGS=-j1
@ -920,7 +927,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog %changelog
* Tue Nov 13 2018 Martin Stransky <stransky@redhat.com> - 63.0.1-6 * 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 * Tue Nov 6 2018 Martin Stransky <stransky@redhat.com> - 63.0.1-5
- Added fix for mozbz#1502457- disable Contextual Feature - Added fix for mozbz#1502457- disable Contextual Feature