forked from pool/MozillaFirefox
- Switch to clang_build globally; just on TW/x86_64 it does not work
due to unreolved externals `__rust_probestack' - disable clang_build then. - useccache: Add conditionals to enable/disable ccache. OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=902
This commit is contained in:
parent
d51fd4059a
commit
106ed5cb05
@ -1,3 +1,11 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Sat Mar 27 10:40:46 UTC 2021 - Manfred Hollstein <manfred.h@gmx.net>
|
||||||
|
|
||||||
|
- Switch to clang_build globally; just on TW/x86_64 it does not work
|
||||||
|
due to unreolved externals `__rust_probestack' - disable clang_build
|
||||||
|
then.
|
||||||
|
- useccache: Add conditionals to enable/disable ccache.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Mar 23 16:42:19 UTC 2021 - Wolfgang Rosenauer <wr@rosenauer.org>
|
Tue Mar 23 16:42:19 UTC 2021 - Wolfgang Rosenauer <wr@rosenauer.org>
|
||||||
|
|
||||||
|
@ -44,13 +44,23 @@
|
|||||||
%define do_profiling 0
|
%define do_profiling 0
|
||||||
|
|
||||||
# upstream default is clang (to use gcc for large parts set to 0)
|
# upstream default is clang (to use gcc for large parts set to 0)
|
||||||
|
%define clang_build 1
|
||||||
|
%if 0%{?is_opensuse} && 0%{?suse_version} >= 1550
|
||||||
|
%ifarch x86_64
|
||||||
|
# on Tumbleweed/x86_64 this does not work due to undefined
|
||||||
|
# references to `__rust_probestack'
|
||||||
%define clang_build 0
|
%define clang_build 0
|
||||||
|
%endif
|
||||||
|
%endif
|
||||||
|
|
||||||
# PIE, full relro
|
# PIE, full relro
|
||||||
%define build_hardened 1
|
%define build_hardened 1
|
||||||
|
|
||||||
%bcond_with only_print_mozconfig
|
%bcond_with only_print_mozconfig
|
||||||
|
|
||||||
|
# define if ccache should be used or not
|
||||||
|
%define useccache 1
|
||||||
|
|
||||||
# Firefox only supports i686
|
# Firefox only supports i686
|
||||||
%ifarch %ix86
|
%ifarch %ix86
|
||||||
ExclusiveArch: i586 i686
|
ExclusiveArch: i586 i686
|
||||||
@ -96,7 +106,9 @@ BuildRequires: gcc9-c++
|
|||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
%endif
|
%endif
|
||||||
BuildRequires: cargo >= 1.47
|
BuildRequires: cargo >= 1.47
|
||||||
|
%if 0%{useccache} != 0
|
||||||
BuildRequires: ccache
|
BuildRequires: ccache
|
||||||
|
%endif
|
||||||
BuildRequires: libXcomposite-devel
|
BuildRequires: libXcomposite-devel
|
||||||
BuildRequires: libcurl-devel
|
BuildRequires: libcurl-devel
|
||||||
BuildRequires: libidl-devel
|
BuildRequires: libidl-devel
|
||||||
@ -455,7 +467,9 @@ ac_add_options --disable-elf-hack
|
|||||||
#%endif
|
#%endif
|
||||||
ac_add_options --with-system-nspr
|
ac_add_options --with-system-nspr
|
||||||
ac_add_options --with-system-nss
|
ac_add_options --with-system-nss
|
||||||
|
%if 0%{useccache} != 0
|
||||||
ac_add_options --with-ccache
|
ac_add_options --with-ccache
|
||||||
|
%endif
|
||||||
%if %{localize}
|
%if %{localize}
|
||||||
ac_add_options --with-l10n-base=$RPM_BUILD_DIR/l10n
|
ac_add_options --with-l10n-base=$RPM_BUILD_DIR/l10n
|
||||||
%endif
|
%endif
|
||||||
@ -505,7 +519,9 @@ ac_add_options MOZ_PGO=1
|
|||||||
%endif
|
%endif
|
||||||
EOF
|
EOF
|
||||||
%if !%{with only_print_mozconfig}
|
%if !%{with only_print_mozconfig}
|
||||||
|
%if 0%{useccache} != 0
|
||||||
ccache -s
|
ccache -s
|
||||||
|
%endif
|
||||||
%if 0%{?do_profiling}
|
%if 0%{?do_profiling}
|
||||||
xvfb-run --server-args="-screen 0 1920x1080x24" \
|
xvfb-run --server-args="-screen 0 1920x1080x24" \
|
||||||
%endif
|
%endif
|
||||||
@ -560,8 +576,10 @@ sed -r '/^(ja-JP-mac|ga-IE|en-US|)$/d;s/ .*$//' $RPM_BUILD_DIR/%{srcname}-%{orig
|
|||||||
' -- {}
|
' -- {}
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%if 0%{useccache} != 0
|
||||||
ccache -s
|
ccache -s
|
||||||
%endif
|
%endif
|
||||||
|
%endif
|
||||||
|
|
||||||
%install
|
%install
|
||||||
cd $RPM_BUILD_DIR/obj
|
cd $RPM_BUILD_DIR/obj
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
<size unit="G">36</size>
|
<size unit="G">36</size>
|
||||||
</disk>
|
</disk>
|
||||||
<memory>
|
<memory>
|
||||||
<size unit="G">26</size>
|
<size unit="G">8</size>
|
||||||
</memory>
|
</memory>
|
||||||
<memoryperjob>
|
<memoryperjob>
|
||||||
<size unit="M">2000</size>
|
<size unit="M">2000</size>
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:bf18b5dfabd2d34939290bb84ae00cdd37d3e1e1f16f702d8a294340b3443bc8
|
oid sha256:e62d275b344f0972a032c5b6d6aa1522671b08856890d03ae55b569310b8a686
|
||||||
size 49956188
|
size 49925540
|
||||||
|
Loading…
Reference in New Issue
Block a user