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

Handle dynamic stack size on GLIBC > 2.33 #2317

Closed
wants to merge 1 commit into from

Conversation

michel-slm
Copy link

Description

On GLIBC 2.33, MINSIGSTKSZ is not a constant. This can be detected
at compile time by the presence of either _SC_SIGSTKSZ_SOURCE or
_GNU_SOURCE.

If either are define, hardcode the size we want rather than compare it,
since we can't do that in a constant expression anymore.

Signed-off-by: Michel Alexandre Salim [email protected]

GitHub Issues

Closes #2178

On GLIBC 2.33, `MINSIGSTKSZ` is not a constant. This can be detected
at compile time by the presence of either `_SC_SIGSTKSZ_SOURCE` or
`_GNU_SOURCE`.

If either are define, hardcode the size we want rather than compare it,
since we can't do that in a constant expression anymore.

Signed-off-by: Michel Alexandre Salim <[email protected]>
@michel-slm
Copy link
Author

note: I maintain the Eternal Terminal package for Fedora, and have had to carry an out-of-tree patch for its bundled Catch2 since Fedora 35 was in development

@codecov
Copy link

codecov bot commented Nov 4, 2021

Codecov Report

Merging #2317 (f83d032) into devel (912df7d) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##            devel    #2317   +/-   ##
=======================================
  Coverage   91.01%   91.01%           
=======================================
  Files         151      151           
  Lines        7193     7193           
=======================================
  Hits         6546     6546           
  Misses        647      647           

@horenmar
Copy link
Member

horenmar commented Nov 4, 2021

Thanks for the effort, but the amalg. files (and for v2.x branch the single header file) are only updated on release.

Given that the problem has already been fixed in the devel branch (I actually spent some time wondering wtf, knowing that I fixed this issue already, until I noticed you edited the catch_amalgamated.cpp file), you want to regenerate the files and then update the bundled version in the Eternal Terminal package.

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.

Catch2 fails to compile on Fedora Rawhide
2 participants