s390x fails on: os.unlink(f.name) in icu build, try to ignore that
This commit is contained in:
parent
b1a0834b12
commit
9e2616bb3f
@ -42,6 +42,7 @@ Patch13: emitter_test.patch
|
|||||||
Patch14: init_patch.patch
|
Patch14: init_patch.patch
|
||||||
# TODO: Check with mozilla for cause of these fails and re-enable spidermonkey compile time checks if needed
|
# TODO: Check with mozilla for cause of these fails and re-enable spidermonkey compile time checks if needed
|
||||||
Patch15: spidermonkey_checks_disable.patch
|
Patch15: spidermonkey_checks_disable.patch
|
||||||
|
Patch16: s390x_icu_ignore_unlink_fail.patch
|
||||||
|
|
||||||
# Patches from Fedora firefox package:
|
# Patches from Fedora firefox package:
|
||||||
Patch26: build-icu-big-endian.patch
|
Patch26: build-icu-big-endian.patch
|
||||||
@ -98,6 +99,12 @@ pushd ../..
|
|||||||
%patch14 -p1
|
%patch14 -p1
|
||||||
%patch15 -p1
|
%patch15 -p1
|
||||||
|
|
||||||
|
# Something weird going on in icu build, try to ignore error when removing file
|
||||||
|
# FIXME
|
||||||
|
%ifarch s390x
|
||||||
|
%patch16 -p1
|
||||||
|
%endif
|
||||||
|
|
||||||
# Patch for big endian platforms only
|
# Patch for big endian platforms only
|
||||||
%if 0%{?big_endian}
|
%if 0%{?big_endian}
|
||||||
%patch26 -p1 -b .icu
|
%patch26 -p1 -b .icu
|
||||||
|
12
s390x_icu_ignore_unlink_fail.patch
Normal file
12
s390x_icu_ignore_unlink_fail.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
--- firefox-68.0/intl/icu_sources_data.py
|
||||||
|
+++ firefox-68.0/intl/icu_sources_data.py
|
||||||
|
@@ -196,7 +196,10 @@
|
||||||
|
file=sys.stderr)
|
||||||
|
return False
|
||||||
|
else:
|
||||||
|
- os.unlink(f.name)
|
||||||
|
+ try:
|
||||||
|
+ os.unlink(f.name)
|
||||||
|
+ except NameError:
|
||||||
|
+ print('FIXME: intl/icu_sources_data.py: Failed to remove file')
|
||||||
|
return True
|
Loading…
Reference in New Issue
Block a user