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.

Sign up for GitHub

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

Jump to bottom

Various OS X fixes #27

Merged
merged 7 commits into from
Apr 16, 2017
Merged

Various OS X fixes #27

merged 7 commits into from
Apr 16, 2017

Conversation

jakirkham
Copy link
Member

@jakirkham jakirkham commented Apr 14, 2017 •
edited
Loading

Fixes #9
Fixes #22

  • Use the toolchain.
  • Rebuild with the new x264, which also uses the toolchain.
  • Package the GPL2 license as we are under GPL2 in this build.
  • Re-render with conda-smithy 2.2.2.
  • Use sha256 with the Unix source.
  • Require bzip2 and libiconv to avoid system linkages.
  • Bump the build number for a fresh build.
  • Style fixes.

@conda-forge-linter
Copy link

Hi! This is the friendly automated conda-forge-linting service.

I just wanted to let you know that I linted all conda-recipes in your PR (recipe) and found it was in an excellent condition.

@jakirkham jakirkham mentioned this pull request Apr 14, 2017
Closed
@jakirkham
Package the GPL2 license file on Unix
2b08972 
Not seeing the license for FFmpeg on Windows. Though they do ship tons
of license with the package. Can revisit later.
@jakirkham
Use the toolchain
fe94310
@jakirkham
MNT: Re-rendered with conda-smithy 2.2.2
c7b172b
@jakirkham
Switch to sha256 for Unix source
e961444
@jakirkham
Require bzip2 and libiconv
11219b2 
Was using the system copies of these on OS X and possibly on Linux. Have
added them as explicit dependency to avoid this.
@jakirkham
Bump build number to 5
b2a09a9
@jakirkham
Copy link
Member Author

Seems to now build on Travis CI again. Now is using clang/clang++ to do the build. Also is only linking to acceptable system things on OS X like libc++. Appears to be picking up all other libraries from our dependencies. Included some other minor fixes.

Would appreciate it if @183amir and @caspervdw looked at this in particular, but also welcome reviews from others.

This was referenced Apr 14, 2017
Closed
Closed
183amir
183amir approved these changes Apr 14, 2017
View reviewed changes
Copy link
Contributor

@183amir 183amir left a comment

Choose a reason for hiding this comment

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

Great work @jakirkham thank you.

@caspervdw
Copy link
Contributor

Fantastic @jakirkham! I will have a good look soon. Maybe also @danielballan wants to check this?

@danielballan danielballan merged commit 1f49d27 into conda-forge:master Apr 16, 2017
@caspervdw caspervdw mentioned this pull request Apr 22, 2017
Merged
@jakirkham jakirkham deleted the various_osx_fixes branch May 17, 2017 04:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@danielballan danielballan danielballan approved these changes

@183amir 183amir 183amir approved these changes

@caspervdw caspervdw caspervdw approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

libgcc breaks my python extention on OSX Various fixes needed on OS X
5 participants
@jakirkham @conda-forge-linter @caspervdw @danielballan @183amir