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

ENH add extra sysroot deps to mark builds #32

Merged
merged 2 commits into from
Jul 25, 2020
Merged

ENH add extra sysroot deps to mark builds #32

merged 2 commits into from
Jul 25, 2020

Conversation

beckermr
Copy link
Member

@beckermr beckermr commented Jul 17, 2020

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.

This PR adds a few extra sysroot deps to mark the builds for the C/C++/FORTRAN compilers as belonging to the new sysroots. This enables us to use a repodata patch for the vendored sysroot versions of these compilers (conda-forge/conda-forge-repodata-patches-feedstock#66).

@beckermr beckermr requested a review from isuruf as a code owner July 17, 2020 11:13
@conda-forge-linter
Copy link

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

I wanted to let you know that I linted all conda-recipes in your PR (recipe) and found some lint.

Here's what I've got...

For recipe:

  • The home item is expected in the about section.
  • The license item is expected in the about section.
  • The summary item is expected in the about section.
  • The outputs section contained an unexpected subsection name. target is not a valid subsection name.
  • The outputs section contained an unexpected subsection name. target is not a valid subsection name.
  • The outputs section contained an unexpected subsection name. target is not a valid subsection name.
  • The outputs section contained an unexpected subsection name. target is not a valid subsection name.

@beckermr
Copy link
Member Author

@conda-forge-admin rerender

@beckermr beckermr changed the title ENH add extra sysroot deps to mark builds [DO NOT MERGE] ENH add extra sysroot deps to mark builds Jul 17, 2020
@beckermr
Copy link
Member Author

ok @isuruf @conda-forge/core this is the last PR we need to enable cos7!

@isuruf
Copy link
Member

isuruf commented Jul 24, 2020

Shouldn't the activation packages also need a conflict with sysroot_*? Otherwise the old activation packages will be used with this new package.

@beckermr
Copy link
Member Author

Shouldn't the activation packages also need a conflict with sysroot_*? Otherwise the old activation packages will be used with this new package.

Why do the activation packages care about the sysroot stuff?

@beckermr
Copy link
Member Author

@#!$@#!$@#!

How did I not know about this?!

UGH. Will make a PR and send repodata patches today. :/

@beckermr
Copy link
Member Author

beckermr commented Jul 24, 2020

OK. I have the PR for the depo data patches here: conda-forge/conda-forge-repodata-patches-feedstock#68

We'll have to merge this PR after the repo data patches. We need it to make the pr on the activation scripts.

@beckermr beckermr changed the title [DO NOT MERGE] ENH add extra sysroot deps to mark builds ENH add extra sysroot deps to mark builds Jul 25, 2020
@beckermr
Copy link
Member Author

Ok @isuruf, I think this one is ready to merge!

@isuruf isuruf merged commit c467055 into conda-forge:master Jul 25, 2020
@beckermr beckermr deleted the sysroot-deps branch July 25, 2020 02:59
@jaimergp
Copy link
Member

I think this PR is breaking gfortran tests for CMake 3.17. See logs for conda-forge/ambertools-feedstock#41.

@beckermr
Copy link
Member Author

fixed in #33

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

4 participants