Commit 40cad9af authored by Mike Hommey's avatar Mike Hommey
Browse files

Bug 1747211 - Stop bootstrapping nasm from Linux distro packages...

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
parent c009d9f4
Loading
Loading
Loading
Loading
+0 −5
Original line number Diff line number Diff line
@@ -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.
+0 −17
Original line number Diff line number Diff line
@@ -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:
+0 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ class CentOSFedoraBootstrapper(LinuxBootstrapper, BaseBootstrapper):
            # Development group.
            "libstdc++-static",
            "libXt-devel",
            "nasm",
            "pulseaudio-libs-devel",
            "gcc-c++",
        ]
+0 −3
Original line number Diff line number Diff line
@@ -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)
+0 −3
Original line number Diff line number Diff line
@@ -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:
Loading