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

Removed old ac_add_options and variables

Browse Source
This commit is contained in:
Jan Horak 2023-07-26 14:13:20 +02:00
parent a3ab6bbdcb
commit 9142c39a1f
1 changed files with 5 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
thunderbird.spec
View File

@ -42,21 +42,8 @@ ExcludeArch: armv7hl
ExcludeArch: s390x ExcludeArch: s390x
# libvpx is too new for Firefox 65 # libvpx is too new for Firefox 65
%if 0%{?fedora} < 30
%global system_libvpx 1
%else
%global system_libvpx 0
%endif
%define system_jpeg 1 %define system_jpeg 1
# Use system libicu? - libicu even on rawhide too old
%if 0%{?fedora} >= 27
%define system_libicu 0
%else
%define system_libicu 0
%endif
# Big endian platforms # Big endian platforms
%ifarch ppc64 s390x %ifarch ppc64 s390x
# Javascript Intl API is not supported on big endian platforms right now: # Javascript Intl API is not supported on big endian platforms right now:
@ -64,10 +51,6 @@ ExcludeArch: s390x
%define big_endian 1 %define big_endian 1
%endif %endif
%if %{?system_libvpx}
%global libvpx_version 1.4.0
%endif
%define thunderbird_app_id \{3550f703-e582-4d05-9a08-453d09bdfdc6\} %define thunderbird_app_id \{3550f703-e582-4d05-9a08-453d09bdfdc6\}
%global langpackdir %{mozappdir}/extensions %global langpackdir %{mozappdir}/extensions
@ -82,12 +65,6 @@ ExcludeArch: s390x
%define official_branding 1 %define official_branding 1
%define enable_mozilla_crashreporter 0 %define enable_mozilla_crashreporter 0
# enable crash reporter only for iX86
%ifarch %{ix86} x86_64
%if 0%{?fedora} < 27 && 0%{?rhel} <= 7
%define enable_mozilla_crashreporter 1
%endif
%endif
%if %{with toolchain_clang} %if %{with toolchain_clang}
%global toolchain clang %global toolchain clang
@ -200,9 +177,6 @@ BuildRequires: m4
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: libcurl-devel BuildRequires: libcurl-devel
BuildRequires: mesa-libGL-devel BuildRequires: mesa-libGL-devel
%if %{?system_libvpx}
BuildRequires: libvpx-devel >= %{libvpx_version}
%endif
BuildRequires: pulseaudio-libs-devel BuildRequires: pulseaudio-libs-devel
BuildRequires: libicu-devel BuildRequires: libicu-devel
BuildRequires: perl-interpreter BuildRequires: perl-interpreter
@ -290,9 +264,6 @@ debug %{name}, you want to install %{name}-debuginfo instead.
%endif %endif
%patch -P 304 -p1 -b .1245783 %patch -P 304 -p1 -b .1245783
# Patch for big endian platforms only
#%if 0%{?big_endian}
#%endif
#ARM run-time patch #ARM run-time patch
%ifarch aarch64 %ifarch aarch64
@ -396,23 +367,10 @@ echo "ac_add_options --with-arch=armv5te" >> .mozconfig
echo "ac_add_options --with-float-abi=soft" >> .mozconfig echo "ac_add_options --with-float-abi=soft" >> .mozconfig
echo "ac_add_options --disable-yarr-jit" >> .mozconfig echo "ac_add_options --disable-yarr-jit" >> .mozconfig
%endif %endif
%if %{?system_jpeg}
%if %{?system_libicu}
echo "ac_add_options --with-system-icu" >> .mozconfig
%else
echo "ac_add_options --without-system-icu" >> .mozconfig
%endif
%if !%{?system_jpeg}
echo "ac_add_options --without-system-jpeg" >> .mozconfig
%else
echo "ac_add_options --with-system-jpeg" >> .mozconfig echo "ac_add_options --with-system-jpeg" >> .mozconfig
%endif
%if %{?system_libvpx}
echo "ac_add_options --with-system-libvpx" >> .mozconfig
%else %else
echo "ac_add_options --without-system-libvpx" >> .mozconfig echo "ac_add_options --without-system-jpeg" >> .mozconfig
%endif %endif
%if %{enable_mozilla_crashreporter} %if %{enable_mozilla_crashreporter}
@ -561,6 +519,9 @@ MOZ_SMP_FLAGS=-j1
export MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS" export MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS"
export STRIP=/bin/true export STRIP=/bin/true
export PYTHON=python3.11 export PYTHON=python3.11
%if 0%{?fedora} >= 39
alias python=python3.11
%endif
export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system
./mach build -v ./mach build -v