Get rid of Java in BR

It was needed only to check bundled javascript, it does not make sense during package building
(because we will not try to fix any issues found by it, Chromium developers do a great job themselves).
This commit is contained in:
Mikhail Novosyolov 2022-03-03 00:12:52 +03:00
parent 4731881556
commit 744ffc6776
2 changed files with 1 additions and 31 deletions

View file

@ -127,7 +127,6 @@ Patch643: glib2.0.patch
Patch647: ALT-allow-to-override-clang-through-env-variables.patch
# XXX This patch is not enough to fully fix debuginfo and debugsource subpackages
Patch648: fix-debugsource.patch
Patch649: off-java-check.patch
BuildRequires: bison
BuildRequires: llvm12
@ -159,7 +158,6 @@ BuildRequires: cups-devel
BuildRequires: elfutils
BuildRequires: elfutils-devel
BuildRequires: multiarch-utils
BuildRequires: java-devel
BuildRequires: jpeg-devel
BuildRequires: pam-devel
%if %{mdvver} >= 202110
@ -475,6 +473,7 @@ export PYTHONPATH="../../third_party/pyjson5/src:../../xcb-proto-%{xcb_version}"
use_libjpeg_turbo=false \
enable_widevine=%{is_widevine} \
enable_vulkan=true \
enable_js_type_check=false \
use_pulseaudio=true \
link_pulseaudio=true \
%{pipewire_enablement} \

View file

@ -1,29 +0,0 @@
Workaround build failure
DEBUG: FAILED: gen/mojo/public/js/mojo_bindings_lite.js
DEBUG: /usr/bin/python2 ../../third_party/closure_compiler/js_binary.py --compiler ../../third_party/closure_compiler/compiler/compiler.jar --output gen/mojo/public/js/mojo_bindings_lite.js --deps gen/mojo/public/js/bindings_lite_sources.js_library --sources --flags jscomp_error=accessControls jscomp_error=checkTypes jscomp_error=checkVars jscomp_error=constantProperty jscomp_error=deprecated jscomp_error=externsValidation jscomp_error=globalThis jscomp_error=invalidCasts jscomp_error=misplacedTypeAnnotation jscomp_error=missingProperties jscomp_error=missingReturn jscomp_error=nonStandardJsDocs jscomp_error=suspiciousCode jscomp_error=undefinedNames jscomp_error=undefinedVars jscomp_error=unknownDefines jscomp_error=uselessCode jscomp_error=visibility compilation_level=ADVANCED_OPTIMIZATIONS language_in=ECMASCRIPT_2017 language_out=ECMASCRIPT_2015 generate_exports export_local_property_definitions isolation_mode=IIFE js_module_root=../../ui/webui/resources/ js_module_root=gen/ui/webui/resources/ module_resolution=BROWSER_WITH_TRANSFORMED_PREFIXES browser_resolver_prefix_replacements=\"chrome://resources/=./\" browser_resolver_prefix_replacements=\"//resources/=./\" --externs ../../third_party/closure_compiler/externs/chrome.js ../../third_party/closure_compiler/externs/polymer-1.0.js ../../third_party/closure_compiler/externs/mojo_core.js
DEBUG: Traceback (most recent call last):
DEBUG: File "../../third_party/closure_compiler/js_binary.py", line 20, in <module>
DEBUG: import compiler
DEBUG: File "/builddir/build/BUILD/chromium-91.0.4472.77/third_party/closure_compiler/compiler.py", line 17, in <module>
DEBUG: assert os.path.isfile(_JAVA_PATH), "java only allowed in android builds"
DEBUG: AssertionError: java only allowed in android builds
DEBUG: /bin/sh: /builddir/build/BUILD/chromium-91.0.4472.77/third_party/closure_compiler/../jdk/current/bin/java: No such file or directory
so hardcode path
Reported to upstream:
https://bugs.chromium.org/p/chromium/issues/detail?id=1214022
--- a/third_party/closure_compiler/compiler.py.orig 2021-05-27 21:01:57.998956433 +0300
+++ b/third_party/closure_compiler/compiler.py 2021-05-27 21:33:56.035526231 +0300
@@ -13,8 +13,7 @@
_CURRENT_DIR = os.path.join(os.path.dirname(__file__))
-_JAVA_PATH = os.path.join(_CURRENT_DIR, "..", "jdk", "current", "bin", "java")
-assert os.path.isfile(_JAVA_PATH), "java only allowed in android builds"
+_JAVA_PATH = "/usr/bin/java"
class Compiler(object):
"""Runs the Closure compiler on given source files to typecheck them