Bug 1747211 - Stop bootstrapping nasm from Linux distro packages r=firefox-build-system-reviewers,andi

We install it via a toolchain artifact anyways, if not via mach
bootstrap, via configure's autobootstrap.

Differential Revision: https://phabricator.services.mozilla.com/D134487
This commit is contained in:
Mike Hommey 2021-12-22 21:09:50 +00:00
Родитель c009d9f45b
Коммит 40cad9af3e
6 изменённых файлов: 0 добавлений и 34 удалений

Просмотреть файл

@ -35,7 +35,6 @@ class ArchlinuxBootstrapper(LinuxBootstrapper, BaseBootstrapper):
"libvpx",
"libxt",
"mime-types",
"nasm",
"startup-notification",
"gst-plugins-base-libs",
"libpulse",
@ -70,10 +69,6 @@ class ArchlinuxBootstrapper(LinuxBootstrapper, BaseBootstrapper):
def install_browser_artifact_mode_packages(self, mozconfig_builder):
self.install_browser_packages(mozconfig_builder, artifact_mode=True)
def ensure_nasm_packages(self, state_dir, checkout_root):
# installed via install_browser_packages
pass
def install_mobile_android_packages(self, mozconfig_builder, artifact_mode=False):
# Multi-part process:
# 1. System packages.

Просмотреть файл

@ -145,9 +145,6 @@ MODERN_MERCURIAL_VERSION = LooseVersion("4.9")
# Upgrade rust older than this.
MODERN_RUST_VERSION = LooseVersion(MINIMUM_RUST_VERSION)
# Upgrade nasm older than this.
MODERN_NASM_VERSION = LooseVersion("2.14")
class BaseBootstrapper(object):
"""Base class for system bootstrappers."""
@ -633,9 +630,6 @@ class BaseBootstrapper(object):
def _parse_version(self, path, name=None, env=None):
return self._parse_version_impl(path, name, env, "--version")
def _parse_version_short(self, path, name=None, env=None):
return self._parse_version_impl(path, name, env, "-v")
def _hg_cleanenv(self, load_hgrc=False):
"""Returns a copy of the current environment updated with the HGPLAIN
and HGRCPATH environment variables.
@ -712,17 +706,6 @@ class BaseBootstrapper(object):
"issues with mach. It is recommended to unset this variable."
)
def is_nasm_modern(self):
nasm = which("nasm")
if not nasm:
return False
our = self._parse_version_short(nasm, "version")
if not our:
return False
return our >= MODERN_NASM_VERSION
def is_rust_modern(self, cargo_bin):
rustc = which("rustc", extra_search_dirs=[cargo_bin])
if not rustc:

Просмотреть файл

@ -31,7 +31,6 @@ class CentOSFedoraBootstrapper(LinuxBootstrapper, BaseBootstrapper):
# Development group.
"libstdc++-static",
"libXt-devel",
"nasm",
"pulseaudio-libs-devel",
"gcc-c++",
]

Просмотреть файл

@ -98,9 +98,6 @@ class DebianBootstrapper(LinuxBootstrapper, BaseBootstrapper):
def install_browser_packages(self, mozconfig_builder, artifact_mode=False):
# TODO: Figure out what not to install for artifact mode
self.apt_install(*self.BROWSER_COMMON_PACKAGES)
modern = self.is_nasm_modern()
if not modern:
self.apt_install("nasm")
def install_browser_artifact_mode_packages(self, mozconfig_builder):
self.install_browser_packages(mozconfig_builder, artifact_mode=True)

Просмотреть файл

@ -101,9 +101,6 @@ class OpenSUSEBootstrapper(LinuxBootstrapper, BaseBootstrapper):
self(["pip3", "install", "--upgrade", "pip", "--user"])
self(["pip3", "install", "--upgrade", "Mercurial", "--user"])
def ensure_nasm_packages(self, state_dir, checkout_root):
self.zypper_install("nasm")
def zypper_install(self, *packages):
command = ["zypper", "install"]
if self.no_interactive:

Просмотреть файл

@ -30,7 +30,6 @@ class SolusBootstrapper(LinuxBootstrapper, BaseBootstrapper):
"libevent",
"libvpx",
"libxt",
"nasm",
"libstartup-notification",
"gst-plugins-base",
"gst-plugins-good",
@ -59,10 +58,6 @@ class SolusBootstrapper(LinuxBootstrapper, BaseBootstrapper):
def install_browser_artifact_mode_packages(self, mozconfig_builder):
self.install_browser_packages(mozconfig_builder, artifact_mode=True)
def ensure_nasm_packages(self, state_dir, checkout_root):
# installed via install_browser_packages
pass
def install_mobile_android_packages(self, mozconfig_builder, artifact_mode=False):
try:
self.package_install(*self.MOBILE_ANDROID_COMMON_PACKAGES)