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

getting curl's library not system one, fix #173 #27

Merged
merged 4 commits into from
Oct 25, 2017

Conversation

doutriaux1
Copy link
Contributor

No description provided.

@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.

Copy link
Member

@ocefpaf ocefpaf left a comment

Choose a reason for hiding this comment

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

One minor comment to make this equivalent to the v4.5.0 PR that will be merged after this one.

recipe/build.sh Outdated

# Build static.
cmake -D CMAKE_INSTALL_PREFIX=$PREFIX \
-D CURL_INCLUDE_DIR=$PREFIX/include \
-D CURL_LIBRARY=$PREFIX/lib/libcurl.$LD_SUFFIX \
Copy link
Member

Choose a reason for hiding this comment

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

Please see 3a84292 for the use of SHLIB_EXT.

PS: the CIs indicate that it works and only conda-forge's curl is used 🎉

recipe/build.sh Outdated
@@ -1,7 +1,17 @@
#!/bin/bash
if [ `uname` == "Linux" ]; then
LD_SUFFIX="so"
Copy link
Member

Choose a reason for hiding this comment

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

No need for the if-else clause. See my comment below.

recipe/build.sh Outdated
elif [ `uname` == "Darwin" ]; then
LD_SUFFIX="dylib"
else
LD_SUFFIX="DLL"
Copy link
Member

Choose a reason for hiding this comment

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

Assuming that everything else is Windows can be dangerous for other people than conda-forge that use this recipe to build on various platforms.

@ocefpaf
Copy link
Member

ocefpaf commented Oct 25, 2017

Travis-CI passed on my instance. Merging this to unlock #26

Thanks @doutriaux1!

@ocefpaf ocefpaf merged commit 07bb75d into conda-forge:master Oct 25, 2017
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.

3 participants