Workaround build failure with glibc >= 2.34

[schnitzeltony]

Seems glibc changed definition of MINSIGSTKSZ to

| # define MINSIGSTKSZ SIGSTKSZ
and
| # define SIGSTKSZ sysconf (_SC_SIGSTKSZ)

which is not constexpr. So build fails with:
| In file included from /home/superandy/tmp/oe-core-glibc/work/cortexa72-mortsgna-linux/surge/1.9.0-r0/recipe-sysroot/usr/include/signal.h:328,
| from /home/superandy/tmp/oe-core-glibc/work/cortexa72-mortsgna-linux/surge/1.9.0-r0/git/libs/catch2/include/catch2/catch2.hpp:7641,
| from /home/superandy/tmp/oe-core-glibc/work/cortexa72-mortsgna-linux/surge/1.9.0-r0/git/src/headless/UnitTests.cpp:3:
| /home/superandy/tmp/oe-core-glibc/work/cortexa72-mortsgna-linux/surge/1.9.0-r0/git/libs/catch2/include/catch2/catch2.hpp:10455:58: error: call to non-'constexpr' function 'long int sysconf(int)'
| 10455 | static constexpr std::size_t sigStackSize = 32768 >= MINSIGSTKSZ ? 32768 : MINSIGSTKSZ;
| | ^~~~~~~~~~~
| In file included from /home/superandy/tmp/oe-core-glibc/work/cortexa72-mortsgna-linux/surge/1.9.0-r0/recipe-sysroot/usr/include/bits/sigstksz.h:24,
| from /home/superandy/tmp/oe-core-glibc/work/cortexa72-mortsgna-linux/surge/1.9.0-r0/recipe-sysroot/usr/include/signal.h:328,
| from /home/superandy/tmp/oe-core-glibc/work/cortexa72-mortsgna-linux/surge/1.9.0-r0/git/libs/catch2/include/catch2/catch2.hpp:7641,
| from /home/superandy/tmp/oe-core-glibc/work/cortexa72-mortsgna-linux/surge/1.9.0-r0/git/src/headless/UnitTests.cpp:3:
| /home/superandy/tmp/oe-core-glibc/work/cortexa72-mortsgna-linux/surge/1.9.0-r0/recipe-sysroot/usr/include/unistd.h:641:17: note: 'long int sysconf(int)' declared here
| 641 | extern long int sysconf (int __name) __THROW;
| | ^~~~~~~
| In file included from /home/superandy/tmp/oe-core-glibc/work/cortexa72-mortsgna-linux/surge/1.9.0-r0/git/src/headless/UnitTests.cpp:3:
| /home/superandy/tmp/oe-core-glibc/work/cortexa72-mortsgna-linux/surge/1.9.0-r0/git/libs/catch2/include/catch2/catch2.hpp:10514:45: error: size of array 'altStackMem' is not an integral constant-expression
| 10514 | char FatalConditionHandler::altStackMem[sigStackSize] = {};
| | ^~~~~~~~~~~~

Signed-off-by: Andreas Müller [email protected]

[baconpaul]

Thank you
Before we merge tbis I want to be sure that cafch2 hasn’t fixed it upstream since we have an amalgamated snapshot we haven’t updated in 18 months

[schnitzeltony]

If upstream has fixed, upgrading is surely the better solution. Then consider this PR just as 'ping - glibc >= 2.34 requires fixes'

[baconpaul]

Yes I will either pull upstream or merge this and notify upstream :)

later tonight though. Will update pr once I get to look

thanks again

[baconpaul]

paul:~/dev/music/surge-xt$ egrep 'v2|MINSIGSTKSZ' ~/Downloads/catch.hpp 
 *  Catch v2.13.7
paul:~/dev/music/surge-xt$ egrep 'v2|MINSIGSTKSZ' libs/catch2/include/catch2/catch2.hpp 
 *  Catch v2.9.2
    static constexpr std::size_t sigStackSize = 32768 >= MINSIGSTKSZ ? 32768 : MINSIGSTKSZ;

yup so let me put in a PR to push us to 2.13.7 and see if things work. If they do I'll close this one.

[baconpaul]

Resolved by upgrade in #4845
if you can confirm that works on your system would be appreciated, but the offending line is missing.
Thanks!

[schnitzeltony]

Replaced my workaround by your catch2 update and can confirm it builds fine with glibc 2.34.
Thanks!

[baconpaul]

Awesome! Hope you enjoy using surge in your project. Let us know if you run into any other troubles.