Bug 1340379 - Remove hardcoded Homebrew URL of autoconf 2.13 for macOS. r?nalexander draft
authorKuoE0 <kuoe0.tw@gmail.com>
Fri, 17 Feb 2017 11:14:29 +0800
changeset 485711 c84276851219b0817bfafd3aa7e4868cfb2c560d
parent 485710 1dd153acb721de1ca45a036f0103ddc15fd23854
child 546101 c7329980e9719f70732c998dc168c14ae8f31d91
push id45825
push userbmo:kuoe0@mozilla.com
push dateFri, 17 Feb 2017 03:15:25 +0000
reviewersnalexander
bugs1340379
milestone54.0a1
Bug 1340379 - Remove hardcoded Homebrew URL of autoconf 2.13 for macOS. r?nalexander MozReview-Commit-ID: 2QRkVCOFTUL
python/mozboot/mozboot/osx.py
--- a/python/mozboot/mozboot/osx.py
+++ b/python/mozboot/mozboot/osx.py
@@ -16,17 +16,16 @@ except ImportError:
 
 from distutils.version import StrictVersion
 
 from mozboot.base import BaseBootstrapper
 
 HOMEBREW_BOOTSTRAP = 'https://raw.githubusercontent.com/Homebrew/install/master/install'
 XCODE_APP_STORE = 'macappstore://itunes.apple.com/app/id497799835?mt=12'
 XCODE_LEGACY = 'https://developer.apple.com/downloads/download.action?path=Developer_Tools/xcode_3.2.6_and_ios_sdk_4.3__final/xcode_3.2.6_and_ios_sdk_4.3.dmg'
-HOMEBREW_AUTOCONF213 = 'https://raw.githubusercontent.com/Homebrew/homebrew-core/master/Formula/autoconf@2.13.rb'
 
 MACPORTS_URL = {'11': 'https://distfiles.macports.org/MacPorts/MacPorts-2.3.4-10.11-ElCapitan.pkg',
                 '10': 'https://distfiles.macports.org/MacPorts/MacPorts-2.3.4-10.10-Yosemite.pkg',
                 '9': 'https://distfiles.macports.org/MacPorts/MacPorts-2.3.4-10.9-Mavericks.pkg',
                 '8': 'https://distfiles.macports.org/MacPorts/MacPorts-2.3.4-10.8-MountainLion.pkg',
                 '7': 'https://distfiles.macports.org/MacPorts/MacPorts-2.3.4-10.7-Lion.pkg',
                 '6': 'https://distfiles.macports.org/MacPorts/MacPorts-2.3.4-10.6-SnowLeopard.pkg', }
 
@@ -311,17 +310,17 @@ class OSXBootstrapper(BaseBootstrapper):
         packages = [
             # We need to install Python because Mercurial requires the Python
             # development headers which are missing from OS X (at least on
             # 10.8) and because the build system wants a version newer than
             # what Apple ships.
             ('python', 'python'),
             ('mercurial', 'mercurial'),
             ('git', 'git'),
-            ('autoconf213', HOMEBREW_AUTOCONF213),
+            ('autoconf@2.13', 'autoconf@2.13'),
             ('gnu-tar', 'gnu-tar'),
             ('watchman', 'watchman',),
             ('terminal-notifier', 'terminal-notifier')
         ]
         self._ensure_homebrew_packages(packages)
 
     def ensure_homebrew_browser_packages(self, artifact_mode=False):
         # TODO: Figure out what not to install for artifact mode