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 building on OpenBSD #3808

Merged
merged 1 commit into from
Apr 19, 2023

Conversation

brad0
Copy link
Contributor

@brad0 brad0 commented Apr 18, 2023

No description provided.

Copy link
Collaborator

@lgritz lgritz left a comment

Choose a reason for hiding this comment

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

Thanks for the fix!

LGTM, though it seems to be failing the "clang-format" test, can you please fix the line wrap here? (Click on the failed test to see where it "breaks," which will include the diff that shows how to make it conform.)

@brad0
Copy link
Contributor Author

brad0 commented Apr 19, 2023

though it seems to be failing the "clang-format" test

Sure thing, done.

Copy link
Collaborator

@lgritz lgritz left a comment

Choose a reason for hiding this comment

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

LGTM, thanks. Will merge as soon as the rest of the CI passes.

@lgritz lgritz added this pull request to the merge queue Apr 19, 2023
Merged via the queue into AcademySoftwareFoundation:master with commit efe2fe0 Apr 19, 2023
16 of 20 checks passed
@lgritz
Copy link
Collaborator

lgritz commented Apr 19, 2023

Oops, I thought the "merge queue" would wait until all the checks passed. Oh well. I think it's safe, I don't think this can affect any non-OpenBSD builds, which of course aren't included in our CI.

@brad0
Copy link
Contributor Author

brad0 commented Apr 19, 2023

Please backport to 2.5 and 2.4.

lgritz pushed a commit to lgritz/OpenImageIO that referenced this pull request Apr 19, 2023
@lgritz
Copy link
Collaborator

lgritz commented Apr 19, 2023

I backported to 2.4 (in the dev-2.4 branch) and it will be part of the next tagged release scheduled for 1 May.

I'm not sure what you mean by "backport to 2.5." There is no official 2.5 release family yet; the current "master" branch is what will become 2.5 later this year.

@brad0
Copy link
Contributor Author

brad0 commented Apr 19, 2023

I'm not sure what you mean by "backport to 2.5." There is no official 2.5 release family yet; the current "master" branch is what will become 2.5 later this year.

I saw something that looked like tags towards a 2.5 release and wasn't sure so included it just in case.

@lgritz
Copy link
Collaborator

lgritz commented Apr 19, 2023

Yeah, I occasionally add "developer preview" tags to mark places that seem stable in the master branch, for people who need things that are only in master. But there's no support or backporting for those, just the occasional tag dropped to mark "I've used it in production here, seems ok."

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

2 participants