Skip to content

Update SystemModules.md to succeed on OS X 10.11 #113

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

Merged
merged 1 commit into from
Jan 21, 2016

Conversation

jpsim
Copy link
Contributor

@jpsim jpsim commented Jan 19, 2016

El Capitan's System Integrity Protection prevents the user from installing
anything in /usr/include or /usr/lib, so use /usr/local instead, which is
also where Homebrew installs jpeg.

Also remove the statement about Homebrew’s jpeglib.h being correct
because that's false.

@@ -177,7 +177,7 @@ And run it:

---

Please note that on Ubuntu 15.10 the above steps fail with:
Please note that on some platforms, the above steps fail with:

<module-includes>:1:10: note: in file included from <module-includes>:1:
#include "/usr/include/jpeglib.h"
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should local be added here too?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, addressed.

@mxcl
Copy link
Contributor

mxcl commented Jan 20, 2016

These instructions are also/mostly for Linux where the system packager will be installing to /usr.

@jpsim
Copy link
Contributor Author

jpsim commented Jan 20, 2016

Thanks for the feedback, @kylef and @mxcl! I've updated the PR to just refer to the Homebrew-specific parts.

@mxcl
Copy link
Contributor

mxcl commented Jan 20, 2016

Don't reference brew, if we must have this addition, simply point out that libraries may also be installed into other places that /usr, for instance: /usr/local.

@jpsim
Copy link
Contributor Author

jpsim commented Jan 20, 2016

Done.

@mxcl
Copy link
Contributor

mxcl commented Jan 21, 2016

Great, thank you. Can we squash these changes? I'm sorry to ask as it is tedious, but there are many effects and emails when I merge and people prefer singular histories where appropriate.

El Capitan's System Integrity Protection prevents the user from installing
anything in `/usr/include` or `/usr/lib`, so use `/usr/local` instead, which is
also where Homebrew installs `jpeg`.

Also remove the statement about Homebrew’s jpeglib.h being correct
because that's false.
@jpsim
Copy link
Contributor Author

jpsim commented Jan 21, 2016

No problem at all, rebased and squashed.

mxcl added a commit that referenced this pull request Jan 21, 2016
Update SystemModules.md to succeed on OS X 10.11
@mxcl mxcl merged commit 1b94891 into swiftlang:master Jan 21, 2016
@jpsim jpsim deleted the patch-1 branch January 21, 2016 02:58
aciidgh pushed a commit to aciidgh/swift-package-manager that referenced this pull request Jan 11, 2019
[BuildSystem] Add support for directory signatures.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants