Clean up icu_sources_data-Write-command-output-to-our-stderr.patch
I should learn to read before fixing stuff :)
This commit is contained in:
parent
f43acdd3a0
commit
e29ba1bb2e
|
@ -13,7 +13,7 @@ diff --git a/intl/icu_sources_data.py b/intl/icu_sources_data.py
|
||||||
index 8cf9290..7d2d983 100644
|
index 8cf9290..7d2d983 100644
|
||||||
--- a/intl/icu_sources_data.py
|
--- a/intl/icu_sources_data.py
|
||||||
+++ b/intl/icu_sources_data.py
|
+++ b/intl/icu_sources_data.py
|
||||||
@@ -187,13 +187,11 @@
|
@@ -187,16 +187,13 @@
|
||||||
|
|
||||||
def try_run(name, command, cwd=None, **kwargs):
|
def try_run(name, command, cwd=None, **kwargs):
|
||||||
try:
|
try:
|
||||||
|
@ -21,13 +21,14 @@ index 8cf9290..7d2d983 100644
|
||||||
- subprocess.check_call(command, cwd=cwd, stdout=f,
|
- subprocess.check_call(command, cwd=cwd, stdout=f,
|
||||||
- stderr=subprocess.STDOUT, **kwargs)
|
- stderr=subprocess.STDOUT, **kwargs)
|
||||||
+ subprocess.check_call(command, cwd=cwd, stdout=sys.stderr,
|
+ subprocess.check_call(command, cwd=cwd, stdout=sys.stderr,
|
||||||
+ stderr=subprocess.STDOUT, **kwargs)
|
+ stderr=subprocess.STDOUT, **kwargs)
|
||||||
except subprocess.CalledProcessError:
|
except subprocess.CalledProcessError:
|
||||||
- print('''Error running "{}" in directory {}
|
- print('''Error running "{}" in directory {}
|
||||||
- See output in {}'''.format(' '.join(command), cwd, f.name),
|
- See output in {}'''.format(' '.join(command), cwd, f.name),
|
||||||
- file=sys.stderr)
|
- file=sys.stderr)
|
||||||
+ print('''Error running "{}" in directory {}'''.format(' '.join(command), cwd),
|
+ print('''Error running "{}" in directory {}'''.format(' '.join(command), cwd),
|
||||||
+ file=sys.stderr)
|
+ file=sys.stderr)
|
||||||
return False
|
return False
|
||||||
else:
|
else:
|
||||||
os.unlink(f.name)
|
- os.unlink(f.name)
|
||||||
|
return True
|
||||||
|
|
13
mozjs68.spec
13
mozjs68.spec
|
@ -1,10 +1,5 @@
|
||||||
%global major 68
|
%global major 68
|
||||||
|
|
||||||
# disable armv7 for now... it fails differently on real arm (koji) and emulated (qemu)
|
|
||||||
# error[E0463]: can't find crate for `std` - on qemu
|
|
||||||
# ERROR: Don't know how to translate armv7hl-redhat-linux-gnu for rustc - on koji
|
|
||||||
ExcludeArch: armv7hl
|
|
||||||
|
|
||||||
# LTO - Enable in Release builds, but consider disabling for development as it increases compile time
|
# LTO - Enable in Release builds, but consider disabling for development as it increases compile time
|
||||||
%global build_with_lto 0
|
%global build_with_lto 0
|
||||||
|
|
||||||
|
@ -47,7 +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
|
Patch16: rust_armv7.patch
|
||||||
|
|
||||||
# Patches from Fedora firefox package:
|
# Patches from Fedora firefox package:
|
||||||
Patch26: build-icu-big-endian.patch
|
Patch26: build-icu-big-endian.patch
|
||||||
|
@ -104,9 +99,9 @@ pushd ../..
|
||||||
%patch14 -p1
|
%patch14 -p1
|
||||||
%patch15 -p1
|
%patch15 -p1
|
||||||
|
|
||||||
# Something weird going on in icu build, try to ignore error when removing file
|
# Correct armv7hl rust triple is armv7-unknown-linux-gnueabihf and not armv7-unknown-linux-gnueabi
|
||||||
# FIXME
|
# according to rust spec file in Fedora
|
||||||
%ifarch s390x
|
%ifarch armv7hl
|
||||||
%patch16 -p1
|
%patch16 -p1
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
|
|
@ -1,12 +0,0 @@
|
||||||
--- 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