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

Fix zlib compilation on conan and AppleClang 12.0 #2403

Merged
merged 1 commit into from
Aug 19, 2020

Conversation

yamadapc
Copy link
Contributor

@yamadapc yamadapc commented Aug 4, 2020

I'm not sure what these replaces were doing.

Happy to create a new recipe if that is a safer change, since I just don't know what the replaces were doing, this just fixed it on my computer™️.

c.c. @lasote who wrote the recipe.

Related to:

Introduced in #1

Specify library name and version: zlib/1.2.11

  • I've read the guidelines for contributing.
  • I've followed the PEP8 style guides for Python code in the recipes.
  • I've used the latest Conan client version.
  • I've tried at least one configuration locally with the
    conan-center hook activated.

@CLAassistant
Copy link

CLAassistant commented Aug 4, 2020

CLA assistant check
All committers have signed the CLA.

@conan-center-bot
Copy link
Collaborator

Sorry, the build is only launched for Early Access Program users. You can request access writing in this issue.

Copy link
Member

@uilianries uilianries left a comment

Choose a reason for hiding this comment

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

Hi @yamadapc ! Thanks for your contribution, please, take a look on my review

recipes/zlib/1.2.11/conanfile.py Show resolved Hide resolved
recipes/zlib/1.2.11/conanfile.py Show resolved Hide resolved
@uilianries
Copy link
Member

@yamadapc Please, ask for EAP inclusion in #4, otherwise the CI bot won't run this PR.

@yamadapc yamadapc mentioned this pull request Aug 5, 2020
@conan-center-bot
Copy link
Collaborator

Sorry, the build is only launched for Early Access Program users. You can request access writing in this issue.

@conan-center-bot
Copy link
Collaborator

Sorry, the build is only launched for Early Access Program users. You can request access writing in this issue.

'/* may be set to #if 1 by ./configure */',
'#if defined(HAVE_STDARG_H) && (1-HAVE_STDARG_H-1 != 0)')

is_apple_clang12 = self.settings.compiler == "apple-clang" and tools.Version(self.settings.compiler.version) >= "12.0"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

It should now run the replaces unless on AppleClang >= "12.0"

uilianries
uilianries previously approved these changes Aug 5, 2020
@uilianries uilianries requested review from jgsogo and SSE4 August 5, 2020 14:34
jgsogo
jgsogo previously approved these changes Aug 5, 2020
Copy link
Contributor

@jgsogo jgsogo left a comment

Choose a reason for hiding this comment

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

Waiting for @yamadapc to be added to the EAP (just a little bit of patience).

Thanks for your contribution.

@SSE4 SSE4 removed their request for review August 11, 2020 08:40
I'm not sure what these replaces were doing. Disabled them if on
AppleClang 12.0 or higher.

Related to:

- boostorg/build#638
- madler/zlib#509
@yamadapc yamadapc dismissed stale reviews from jgsogo and uilianries via 56ddf38 August 17, 2020 08:28
@yamadapc
Copy link
Contributor Author

Forced push to re-trigger the build. Please have another look.

Thanks

@conan-center-bot
Copy link
Collaborator

All green in build 4 (56ddf3826189dad5ddedc2495b260382507c990a)! 😊

@uilianries uilianries merged commit ed9ec83 into conan-io:master Aug 19, 2020
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.

7 participants