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

Replace cdts and yum_requirements.txt with Conda packages #25

Merged
merged 9 commits into from
Oct 30, 2024

Conversation

conda-forge-admin
Copy link
Contributor

@conda-forge-admin conda-forge-admin commented Oct 30, 2024

Fixes #19

Drops usage of cdt's and system packages (via yum_requirements.txt). These are all supplied via Conda Packages. So just use those instead. This will also help prep for building AlmaLinux 8, which has fewer CDTs supplied

xref:

@jakirkham
Copy link
Member

@conda-forge-admin , please re-render

@conda-forge-admin
Copy link
Contributor Author

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/meta.yaml) and found it was in an excellent condition.

@conda-forge-admin conda-forge-admin marked this pull request as ready for review October 30, 2024 06:37
@jakirkham
Copy link
Member

@conda-forge-admin , please re-render

@jakirkham jakirkham changed the title MNT: rerender [WIP] MNT: rerender Oct 30, 2024
conda-forge-webservices[bot] and others added 2 commits October 30, 2024 07:06
@jakirkham jakirkham marked this pull request as draft October 30, 2024 07:08
@jakirkham
Copy link
Member

@conda-forge-admin , please re-render

@conda-forge-admin
Copy link
Contributor Author

Hi! This is the friendly automated conda-forge-webservice.

I tried to rerender for you, but it looks like there was nothing to do.

This message was generated by GitHub actions workflow run https://github.com/conda-forge/conda-forge-webservices/actions/runs/11591765229.

@jakirkham jakirkham changed the title [WIP] MNT: rerender Replace cdts and yum_requirements.txt with Conda packages Oct 30, 2024
@jakirkham jakirkham marked this pull request as ready for review October 30, 2024 11:08
@jakirkham
Copy link
Member

Ok now have this working. This is ready for review! 🙂

Copy link
Contributor

@pentschev pentschev left a comment

Choose a reason for hiding this comment

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

Only left a couple of questions due to my lack of knowledge of the build system, but otherwise LGTM.

-D CMAKE_INSTALL_PREFIX:PATH="${PREFIX}" \
"${SRC_DIR}" \
;
cmake --build . --parallel ${CPU_COUNT}
Copy link
Contributor

Choose a reason for hiding this comment

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

Just curious, is there a reason/benefit for using --parallel instead of -GNinja?

Copy link
Member

@jakirkham jakirkham Oct 30, 2024

Choose a reason for hiding this comment

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

We are still using -G Ninja in the previous invocation of cmake. This command generalizes over commands like make or ninja (without needing to change should the CMake generator change)

Note the next command does the same for make install or ninja install

Copy link
Contributor

Choose a reason for hiding this comment

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

Ah right, my bad, I overlooked that. Thanks for pointing that out!

Copy link
Member

Choose a reason for hiding this comment

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

All good. It is syntax not everyone is familiar with

@@ -22,12 +22,13 @@ requirements:
- {{ compiler("c") }}
- {{ stdlib("c") }}
- {{ compiler("cxx") }}
- {{ cdt("systemd-devel") }}
Copy link
Contributor

Choose a reason for hiding this comment

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

I'm not confident I know/understand why systemd-devel was needed before and is not anymore? Was that unnecessary all the time or was there anything that happened lately that now removes that requirement?

Copy link
Member

Choose a reason for hiding this comment

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

There were some issues while making these changes where it wasn't detecting libsystemd headers. Part of this was addressed by updating the CMake build above

However the other issue is libsystemd and libudev were in requirements/build instead of requirements/host. As these are libraries we are linking to, they should be in requirements/host. So have made that change below: #25 (comment)

Copy link
Contributor

Choose a reason for hiding this comment

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

Thanks for addressing that.

These are linked to in the build. So should be in `requirements/host`.
Comment on lines +32 to +33
- libsystemd
- libudev
Copy link
Member

Choose a reason for hiding this comment

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

These were in requirements/build before. However the build links to them. So these should be in requirements/host. Hence this move

With these changes we now get

-- Found UDev: $PREFIX/lib/libudev.so
...
-- Found Systemd: $PREFIX/lib/libsystemd.so

Copy link
Contributor

@pentschev pentschev left a comment

Choose a reason for hiding this comment

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

LGTM. John, feel free to hit merge if no other changes are needed. Thanks!

@jakirkham
Copy link
Member

Thanks Peter! 🙏

@jakirkham jakirkham merged commit 22455e4 into conda-forge:main Oct 30, 2024
6 checks passed
@jakirkham
Copy link
Member

Please let me know how these changes go. Happy to follow up on anything as needed

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.

Drop cdts and yum_requirements.txt
3 participants