Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Link autoconf after installing autoconf213 on OS X #211

Merged
merged 1 commit into from Feb 6, 2016
Merged
Changes from all commits
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

Link autoconf after installing autoconf213 on OS X

Use --overwrite because autoconf and autoconf213 are installed, and
either one may have been linked beforehand. They overlap in the files
they provide, and Homebrew will refuse to destructively overwrite
any symlinks without an explicit flag.

There's no built-in Salt module for brew link, so for now this is a
quick fix. This provides some idempotence for repeated Salt highstate
runs by checking the directory where Homebrew keeps track of linked
packages (and linking autoconf if it is not linked). It's unknown
whether this approach properly handles updates to one or both packages.

A better approach would be to write a custom Salt state (perhaps
homebrew.linked); even if this state works properly, a custom state
would be more declarative and could be upstreamed to Salt proper.

Closes #210.
Closes servo/servo#9504.
  • Loading branch information
aneeshusa committed Feb 2, 2016
commit 7dce6fa98778bec8b0894de4a22e9126e9334c77
@@ -30,6 +30,20 @@ servo-darwin-homebrew-versions-dependencies:
- homebrew/versions
- require_in:
- pkg: servo-dependencies

homebrew-link-autoconf:
cmd.run:
- name: 'brew link --overwrite autoconf'
- user: administrator
# Warning: Only checks that some autoconf Homebrew package is linked,
# not necessarily the version installed above.
# Whether this handles updating autoconf properly is an open question.
# This state should be replaced by a custom Salt state.
- creates: /usr/local/Library/LinkedKegs/autoconf
- require:
- module: servo-darwin-homebrew-versions-dependencies
- require_in:
- pkg: servo-dependencies
{% endif %}

servo-dependencies:
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.