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

Continuation of @jschuelller's 5.12.4 PR. #120

Closed
wants to merge 12 commits into from

Conversation

mingwandroid
Copy link
Contributor

Checklist

  • Used a fork of the feedstock to propose changes
  • Bumped the build number (if the version is unchanged)
  • Reset the build number to 0 (if the version changed)
  • Re-rendered with the latest conda-smithy (Use the phrase @conda-forge-admin, please rerender in a comment in this PR for automated rerendering)
  • Ensured the license file is being packaged.

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

@ocefpaf
Copy link
Member

ocefpaf commented Sep 3, 2019

@jschueller and @mingwandroid please let me know when O should try to build these locally for the upload.

@@ -61,7 +78,8 @@ source:
folder: opengl32sw # [win64]

build:
number: 0
number: {{ build_number }}
string: {{ build_number }}{{ dev_nature }}
Copy link
Member

Choose a reason for hiding this comment

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

Use the pkg hash here.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

For my debugging purposes I need to switch this depending on dev_nature.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

i.e {% if dev_nature != '' %} .. around it or something like that. dev_nature will not be set unless forced via the command line.

Copy link
Member

Choose a reason for hiding this comment

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

I meant use the pkg hash in addition. Something like {{ PKG_HASH }}_{{ build_number }}{{ dev_nature }}

Copy link
Contributor Author

Choose a reason for hiding this comment

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

OK, cool

@@ -1,2 +1,4 @@
CONDA_BUILD_SYSROOT: # [osx]
- /opt/MacOSX10.12.sdk # [osx]
Copy link
Member

Choose a reason for hiding this comment

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

Remove these 2 lines

Copy link
Contributor Author

Choose a reason for hiding this comment

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

We need these for Anaconda Distro, are they harmful?

Copy link
Member

Choose a reason for hiding this comment

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

Yes, it's harmful for conda-forge as we are installing the SDK somewhere else.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

OK, I'm probably OK with aligning our location then. We do need to force 10.12 somehow though. What is the default ATM? Any clues how to force 10.12?

Copy link
Member

Choose a reason for hiding this comment

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

It is set to $(xcode-select -p)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX${MACOSX_DEPLOYMENT_TARGET}.sdk which wade sense when we were using system compilers.

Default is 10.9. If you set MACOSX_DEPLOYMENT_TARGET to 10.12 as you've done here in recipe/conda_build_config.yaml, the CI script will read that variable, download 10.12, extract it and automatically set CONDA_BUILD_SYSROOT. So there's no need to set CONDA_BUILD_SYSROOT in the recipe. Just MACOSX_DEPLOYMENT_TARGET would do.

@jschueller
Copy link
Contributor

@isuruf, your commit fails:

cp: ../licenses/LICENSE.FDL: No such file or directory

@ocefpaf ocefpaf mentioned this pull request Sep 10, 2019
5 tasks
@jschueller
Copy link
Contributor

I think this one may be closed

@ccordoba12
Copy link
Contributor

Sure, I think so too.

@ccordoba12 ccordoba12 closed this Sep 24, 2019
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.

None yet

6 participants