Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 21:20:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #22247 - servo:brewfile, r=jdm

Browse source 
Use `homebrew bundle` to avoid errors on upgrade available.

`homebrew install` could exit with errors like:

```
Error: cmake 3.12.4 is already installed
To upgrade to 3.13.0, run `brew upgrade cmake`
```

This solution is the one recommended in https://github.com/Homebrew/brew/issues/2491

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22247)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2018-11-22 11:49:10 -05:00 • committed by GitHub
commit cf2ff21592
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

9
README.md
View file

@ -51,19 +51,18 @@ Please select your operating system:
* [Android](#cross-compilation-for-android) * [Android](#cross-compilation-for-android)
#### macOS #### macOS
#### On macOS (homebrew) ##### On macOS (homebrew)
``` sh ``` sh
brew install automake autoconf@2.13 pkg-config python cmake yasm llvm brew bundle install --file=etc/taskcluster/macos/Brewfile
brew install gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-libav gst-rtsp-server --with-orc --with-libogg --with-opus --with-pango --with-theora --with-libvorbis
pip install virtualenv pip install virtualenv
``` ```
#### On macOS (MacPorts) ##### On macOS (MacPorts)
``` sh ``` sh
sudo port install python27 py27-virtualenv cmake yasm llvm sudo port install python27 py27-virtualenv cmake yasm llvm
``` ```
#### On macOS >= 10.11 (El Capitan), you also have to install OpenSSL ##### On macOS >= 10.11 (El Capitan), you also have to install OpenSSL
``` sh ``` sh
brew install openssl brew install openssl

7
etc/taskcluster/decision_task.py
View file

@ -373,13 +373,10 @@ def macos_build_task(name):
.with_script(""" .with_script("""
mkdir -p "$HOME/homebrew" mkdir -p "$HOME/homebrew"
export PATH="$HOME/homebrew/bin:$PATH" export PATH="$HOME/homebrew/bin:$PATH"
which homebrew || curl -L https://github.com/Homebrew/brew/tarball/master \ which brew || curl -L https://github.com/Homebrew/brew/tarball/master \
| tar xz --strip 1 -C "$HOME/homebrew" | tar xz --strip 1 -C "$HOME/homebrew"
time brew install automake autoconf@2.13 pkg-config cmake yasm llvm time brew bundle install --no-upgrade --file=etc/taskcluster/macos/Brewfile
time brew install gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad \
gst-libav gst-rtsp-server \
--with-orc --with-libogg --with-opus --with-pango --with-theora --with-libvorbis
export OPENSSL_INCLUDE_DIR="$(brew --prefix openssl)/include" export OPENSSL_INCLUDE_DIR="$(brew --prefix openssl)/include"
export OPENSSL_LIB_DIR="$(brew --prefix openssl)/lib" export OPENSSL_LIB_DIR="$(brew --prefix openssl)/lib"
""") """)

15
etc/taskcluster/macos/Brewfile Normal file
View file

@ -0,0 +1,15 @@
brew "autoconf@2.13"
brew "automake"
brew "cmake"
brew "openssl"
brew "pkg-config"
brew "gstreamer"
brew "gst-plugins-base", args: ["with-orc", "with-libogg", "with-opus", "with-theora", "with-libvorbis", "with-pango"]
brew "gst-libav"
brew "gst-plugins-bad"
brew "gst-plugins-good"
brew "gst-rtsp-server"
brew "htop"
brew "llvm"
brew "openssl@1.1"
brew "yasm"