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

Update openssl location for osx homebrew #13225

Merged
merged 1 commit into from Sep 14, 2016
Merged

Conversation

@santagada
Copy link
Contributor

santagada commented Sep 11, 2016


  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes fix #__ (github issue number if applicable).
  • There are tests for these changes OR
  • These changes do not require tests because its a documentation change

the location of openssl might have changed, but it reads as of now:

$ brew link --force openssl
Warning: Refusing to link: openssl
Linking keg-only openssl means you may end up linking against the insecure,
deprecated system OpenSSL while using the headers from Homebrew's openssl.
Instead, pass the full include/library paths to your compiler e.g.:
  -I/usr/local/opt/openssl/include -L/usr/local/opt/openssl/lib

This change is Reviewable

@highfive
Copy link

highfive commented Sep 11, 2016

Thanks for the pull request, and welcome! The Servo team is excited to review your changes, and you should hear from @Ms2ger (or someone else) soon.

@santagada
Copy link
Contributor Author

santagada commented Sep 12, 2016

this is now complete and I can run servo without symlinks or any other changes.

README.md Outdated
@@ -49,7 +49,9 @@ Warning: Refusing to link: openssl
followed by a compile error not being able to find one or more
openssl/ include files, you may want to try:
```sh
export DEP_OPENSSL_INCLUDE=/usr/local/include
export DEP_OPENSSL_INCLUDE=`brew --prefix openssl`/include

This comment has been minimized.

@aneeshusa

aneeshusa Sep 12, 2016

Member

Please use

DEP_OPENSSL_INCLUDE="$(brew --prefix openssl)/include"

instead of backticks, per the style guide.

@santagada
Copy link
Contributor Author

santagada commented Sep 13, 2016

thanks @aneeshusa, done

@Ms2ger
Copy link
Contributor

Ms2ger commented Sep 13, 2016

@highfive highfive assigned larsbergstrom and unassigned Ms2ger Sep 13, 2016
@larsbergstrom
Copy link
Contributor

larsbergstrom commented Sep 13, 2016

This looks good to me! Please squash and we can r+.

@aneeshusa
Copy link
Member

aneeshusa commented Sep 13, 2016

@santagada Does this happen always or are there specific conditions that require this change? I'm wondering if we need to update our builder configuration.

@santagada
Copy link
Contributor Author

santagada commented Sep 14, 2016

@aneeshusa according to both sfackler/rust-openssl#453 and my understanding of where brew puts its version of openssl I think it is necessary for the osx builders to do the same.

@santagada
Copy link
Contributor Author

santagada commented Sep 14, 2016

@aneeshusa this seems wrong (as it doesn't work anymore) https://github.com/servo/saltfs/blob/master/servo-build-dependencies/init.sls#L66

changing the environment file (using the values here) and installing openssl from homebrew is the new way of doing it, and seems cleaner as well to not interfere with the openssl from osx.

using the OPENSSL_* variables makes rust-openssl find the hombrew library
without the need to link it to a common lib directory
@santagada santagada force-pushed the santagada:patch-1 branch from c2da776 to a530032 Sep 14, 2016
@santagada
Copy link
Contributor Author

santagada commented Sep 14, 2016

@larsbergstrom squashed

@aneeshusa
Copy link
Member

aneeshusa commented Sep 14, 2016

@santagada Does this require a version bump/minimum version of openssl from homebrew? Would you be willing to make a PR to saltfs?

@larsbergstrom
Copy link
Contributor

larsbergstrom commented Sep 14, 2016

@bors-servo
Copy link
Contributor

bors-servo commented Sep 14, 2016

📌 Commit a530032 has been approved by larsbergstrom

@bors-servo
Copy link
Contributor

bors-servo commented Sep 14, 2016

Testing commit a530032 with merge 1f1e92a...

bors-servo added a commit that referenced this pull request Sep 14, 2016
Update openssl location for osx homebrew

<!-- Please describe your changes on the following line: -->

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because its a documentation change

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

the location of openssl might have changed, but it reads as of now:

```sh
$ brew link --force openssl
Warning: Refusing to link: openssl
Linking keg-only openssl means you may end up linking against the insecure,
deprecated system OpenSSL while using the headers from Homebrew's openssl.
Instead, pass the full include/library paths to your compiler e.g.:
  -I/usr/local/opt/openssl/include -L/usr/local/opt/openssl/lib
```

<!-- 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/13225)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Sep 14, 2016

💔 Test failed - linux-rel

@highfive
Copy link

highfive commented Sep 14, 2016

  ▶ FAIL [expected PASS] /css-transforms-1_dev/html/transform-table-007.htm
  └   → /css-transforms-1_dev/html/transform-table-007.htm a5c014b20ef1363bea6f24eda28c7efb7c45698a
/css-transforms-1_dev/html/reference/transform-blank-ref.htm fa6407b1acbbfea27e27061e7d1bdeca98e4a728
Testing a5c014b20ef1363bea6f24eda28c7efb7c45698a == fa6407b1acbbfea27e27061e7d1bdeca98e4a728
@larsbergstrom
Copy link
Contributor

larsbergstrom commented Sep 14, 2016

@bors-servo
Copy link
Contributor

bors-servo commented Sep 14, 2016

Previous build results for arm32, arm64, linux-dev, mac-dev-unit, mac-rel-css, mac-rel-wpt, windows-dev are reusable. Rebuilding only linux-rel...

@santagada
Copy link
Contributor Author

santagada commented Sep 14, 2016

@aneeshusa I'm willing to help on salt but have no idea were the code for osx are, can you point them to me (I can make the changes and do a PR)

@bors-servo
Copy link
Contributor

bors-servo commented Sep 14, 2016

@bors-servo bors-servo merged commit a530032 into servo:master Sep 14, 2016
3 checks passed
3 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

6 participants
You can’t perform that action at this time.