Bug 1692940 - Don't bootstrap yasm. r=firefox-build-system-reviewers,dmajor

Differential Revision: https://phabricator.services.mozilla.com/D105599

python/mozboot/mozboot/archlinux.py

@@ -44,7 +44,6 @@ class ArchlinuxBootstrapper(LinuxBootstrapper, BaseBootstrapper):
         "gst-plugins-base-libs",
         "libpulse",
         "xorg-server-xvfb",
-        "yasm",
         "gst-libav",
         "gst-plugins-good",
     ]

python/mozboot/mozboot/centosfedora.py

@@ -4,8 +4,6 @@
 
 from __future__ import absolute_import, print_function, unicode_literals
 
-import platform
-
 from mozboot.base import BaseBootstrapper
 from mozboot.linux_common import LinuxBootstrapper
 
@@ -43,7 +41,6 @@ class CentOSFedoraBootstrapper(LinuxBootstrapper, BaseBootstrapper):
             "nasm",
             "pulseaudio-libs-devel",
             "wireless-tools-devel",
-            "yasm",
             "gcc-c++",
         ]
 
@@ -120,19 +117,6 @@ class CentOSFedoraBootstrapper(LinuxBootstrapper, BaseBootstrapper):
         self.dnf_groupinstall(*self.browser_group_packages)
         self.dnf_install(*self.browser_packages)
 
-        if self.distro in ("centos") and self.version == 6:
-            yasm = (
-                "http://dl.fedoraproject.org/pub/epel/6/i386/"
-                "Packages/y/yasm-1.2.0-1.el6.i686.rpm"
-            )
-            if platform.architecture()[0] == "64bit":
-                yasm = (
-                    "http://dl.fedoraproject.org/pub/epel/6/x86_64/"
-                    "Packages/y/yasm-1.2.0-1.el6.x86_64.rpm"
-                )
-
-            self.run_as_root(["rpm", "-ivh", yasm])
-
     def ensure_mobile_android_packages(self, mozconfig_builder, artifact_mode=False):
         # Install Android specific packages.
         self.dnf_install(*self.mobile_android_packages)

python/mozboot/mozboot/debian.py

@@ -59,7 +59,6 @@ class DebianBootstrapper(LinuxBootstrapper, BaseBootstrapper):
         "libx11-xcb-dev",
         "libxt-dev",
         "xvfb",
-        "yasm",
     ]
 
     # These are common packages for building Firefox for Android

python/mozboot/mozboot/freebsd.py

@@ -34,7 +34,6 @@ class FreeBSDBootstrapper(BaseBootstrapper):
             "nasm",
             "pulseaudio",
             "v4l_compat",
-            "yasm",
         ]
 
         if not which("as"):

python/mozboot/mozboot/gentoo.py

@@ -49,7 +49,6 @@ class GentooBootstrapper(LinuxBootstrapper, BaseBootstrapper):
                 "--noreplace",
                 "--quiet",
                 "--newuse",
-                "dev-lang/yasm",
                 "dev-libs/dbus-glib",
                 "media-sound/pulseaudio",
                 "x11-libs/gtk+:2",

python/mozboot/mozboot/openbsd.py

@@ -23,7 +23,6 @@ class OpenBSDBootstrapper(BaseBootstrapper):
         self.browser_packages = [
             "llvm",
             "nasm",
-            "yasm",
             "gtk+2",
             "gtk+3",
             "dbus-glib",

python/mozboot/mozboot/opensuse.py

@@ -31,7 +31,6 @@ class OpenSUSEBootstrapper(LinuxBootstrapper, BaseBootstrapper):
         "libXt-devel",
         "libproxy-devel",
         "libuuid-devel",
-        "yasm",
         "gtk2-devel",
         "clang-devel",
         "patterns-gnome-devel_gnome",

python/mozboot/mozboot/osx.py

@@ -212,12 +212,10 @@ class OSXBootstrapper(BaseBootstrapper):
         getattr(self, "ensure_%s_system_packages" % self.package_manager)(not hg_modern)
 
     def install_browser_packages(self, mozconfig_builder):
-        getattr(self, "ensure_%s_browser_packages" % self.package_manager)()
+        pass
 
     def install_browser_artifact_mode_packages(self, mozconfig_builder):
-        getattr(self, "ensure_%s_browser_packages" % self.package_manager)(
-            artifact_mode=True
-        )
+        pass
 
     def install_mobile_android_packages(self, mozconfig_builder):
         getattr(self, "ensure_%s_mobile_android_packages" % self.package_manager)(
@@ -389,13 +387,6 @@ class OSXBootstrapper(BaseBootstrapper):
             packages.append("mercurial")
         self._ensure_homebrew_packages(packages)
 
-    def ensure_homebrew_browser_packages(self, artifact_mode=False):
-        # TODO: Figure out what not to install for artifact mode
-        packages = [
-            "yasm",
-        ]
-        self._ensure_homebrew_packages(packages)
-
     def ensure_homebrew_mobile_android_packages(
         self, mozconfig_builder, artifact_mode=False
     ):
@@ -467,14 +458,6 @@ class OSXBootstrapper(BaseBootstrapper):
         else:
             print("The right python version is already active.")
 
-    def ensure_macports_browser_packages(self, artifact_mode=False):
-        # TODO: Figure out what not to install for artifact mode
-        packages = [
-            "yasm",
-        ]
-
-        self._ensure_macports_packages(packages)
-
     def ensure_macports_mobile_android_packages(
         self, mozconfig_builder, artifact_mode=False
     ):

python/mozboot/mozboot/solus.py

@@ -43,7 +43,6 @@ class SolusBootstrapper(LinuxBootstrapper, BaseBootstrapper):
         "gst-plugins-good",
         "pulseaudio",
         "xorg-server-xvfb",
-        "yasm",
     ]
 
     MOBILE_ANDROID_COMMON_PACKAGES = [

python/mozboot/mozboot/void.py

@@ -32,7 +32,6 @@ class VoidBootstrapper(LinuxBootstrapper, BaseBootstrapper):
         "libcurl-devel",
         "libxcb-devel",
         "libXt-devel",
-        "yasm",
     ]
 
     MOBILE_ANDROID_PACKAGES = [

python/mozboot/mozboot/windows.py

@@ -58,7 +58,6 @@ class WindowsBootstrapper(BaseBootstrapper):
 
     BROWSER_PACKAGES = [
         "mingw-w64-x86_64-nasm",
-        "mingw-w64-x86_64-yasm",
         "mingw-w64-i686-nsis",
     ]