Switch to system-icu on armv7hl to fix FTBFS
This commit is contained in:
parent
5d7898fdb1
commit
580f5fb0f7
18
mozjs78.spec
18
mozjs78.spec
@ -6,6 +6,12 @@
|
||||
# Require tests to pass?
|
||||
%global require_tests 1
|
||||
|
||||
# Linking fails on armv7hl when using bundled icu, use system one for it, there are bunch of more test failures
|
||||
# TODO: Examine the failures/maybe switch all arches to system-icu
|
||||
%ifarch armv7hl
|
||||
%global require_tests 0
|
||||
%endif
|
||||
|
||||
%if 0%{?build_with_lto}
|
||||
# LTO is default since F33 and F32 package is backported as is, so no LTO there
|
||||
%else
|
||||
@ -24,7 +30,7 @@
|
||||
|
||||
Name: mozjs%{major}
|
||||
Version: 78.15.0
|
||||
Release: 2%{?dist}
|
||||
Release: 3%{?dist}
|
||||
Summary: SpiderMonkey JavaScript library
|
||||
|
||||
License: MPLv2.0 and MPLv1.1 and BSD and GPLv2+ and GPLv3+ and LGPLv2+ and AFL and ASL 2.0
|
||||
@ -63,6 +69,9 @@ Patch30: FixSharedArray.diff
|
||||
Patch31: 0002-D89554-autoconf1.diff
|
||||
Patch32: 0003-D94538-autoconf2.diff
|
||||
|
||||
%ifarch armv7hl
|
||||
BuildRequires: libicu-devel
|
||||
%endif
|
||||
BuildRequires: cargo
|
||||
BuildRequires: clang-devel
|
||||
BuildRequires: gcc
|
||||
@ -169,7 +178,11 @@ export LINKFLAGS="%{?__global_ldflags}"
|
||||
export PYTHON="%{__python3}"
|
||||
|
||||
%configure \
|
||||
%ifnarch armv7hl
|
||||
--without-system-icu \
|
||||
%else
|
||||
--with-system-icu \
|
||||
%endif
|
||||
--with-system-zlib \
|
||||
--disable-tests \
|
||||
--disable-strip \
|
||||
@ -273,6 +286,9 @@ PYTHONPATH=tests/lib %{__python3} jit-test/jit_test.py -s -t 1800 --no-progress
|
||||
%{_includedir}/mozjs-%{major}/
|
||||
|
||||
%changelog
|
||||
* Sun Feb 20 2022 Frantisek Zatloukal <fzatlouk@redhat.com> - 78.15.0-3
|
||||
- Switch to system-icu on armv7hl to fix FTBFS
|
||||
|
||||
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 78.15.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user