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

filesystem.hpp, add support for Haiku #163

Merged
merged 2 commits into from
Feb 20, 2023
Merged

filesystem.hpp, add support for Haiku #163

merged 2 commits into from
Feb 20, 2023

Conversation

Begasus
Copy link
Contributor

@Begasus Begasus commented Feb 18, 2023

No description provided.

@Begasus
Copy link
Contributor Author

Begasus commented Feb 18, 2023

Don't merge yet, need to see if I can find a way to link it to libnetwork on Haiku (for bind and socket).

@jessicah
Copy link

https://github.com/gulrak/filesystem/blob/master/cmake/GhcHelper.cmake#L48

Add something like:

if (HAIKU)
  target_link_libraries(${targetName} -lnetwork)
endif()

@jessicah
Copy link

You may also need for the second macro, depends which part(s) require libnetwork.

@Begasus
Copy link
Contributor Author

Begasus commented Feb 19, 2023

@jessicah thanks for the tip, following the fix for Solaris I managed to get a full build. :) patch comming in later :)

91e71f7

Copy link

@jmairboeck jmairboeck left a comment

Choose a reason for hiding this comment

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

Just a few style comments.

They apply multiple times, I didn't repeat them.

cmake/GhcHelper.cmake Outdated Show resolved Hide resolved
cmake/GhcHelper.cmake Outdated Show resolved Hide resolved
@Begasus
Copy link
Contributor Author

Begasus commented Feb 19, 2023

Should be OK now, did a clean build on Haiku with this PR as a patch, ran the tests (95% passed), only thing I'm missing is an option to disable Werror, but got a fix for that from Gentoo: https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-cpp/gulrak-filesystem/gulrak-filesystem-1.5.12.ebuild#n22

@Begasus
Copy link
Contributor Author

Begasus commented Feb 19, 2023

Would be nice if this gets merged before a new release: #164 :)

Created a PR at haikuports to have this available on Haiku: haikuports/haikuports#7865

@gulrak
Copy link
Owner

gulrak commented Feb 19, 2023

Looks good to me. If the pipeline goes through, I'll merge it. Thanks for the work!

@gulrak gulrak merged commit bc05cc5 into gulrak:master Feb 20, 2023
@Begasus Begasus deleted the haiku branch February 20, 2023 16:39
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