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

Define strlcpy only on platforms where it's not available #14269

Merged
merged 1 commit into from Jan 19, 2024

Conversation

okias
Copy link
Contributor

@okias okias commented Jan 17, 2024

Be smart, do not list platforms and combination which has strlcpy, but detect it.

Right now, we conflict with some variation used on musl-libc on ppc64le. This should resolve it.

Btw. recently released glibc have it (we can forgive Ulrich Drepper now 🤣 )

@okias okias marked this pull request as ready for review January 17, 2024 20:02
@okias
Copy link
Contributor Author

okias commented Jan 17, 2024

failure example:

ninja: job failed: /usr/bin/g++ -DIRRLICHT_API="" -DUSE_CMAKE_CONFIG_H -Dminetest_EXPORTS -I/builds/okias/aports/community/minetest/src/minetest-8093044f071fc6ad20dbc0a07ba2ef824605fff5/build_client/src -I/builds/okias/aports/community/minetest/src/minetest-8093044f071fc6ad20dbc0a07ba2ef824605fff5/src -I/builds/okias/aports/community/minetest/src/minetest-8093044f071fc6ad20dbc0a07ba2ef824605fff5/src/script -I/builds/okias/aports/community/minetest/src/minetest-8093044f071fc6ad20dbc0a07ba2ef824605fff5/lib/irrlichtmt/include -I/builds/okias/aports/community/minetest/src/minetest-8093044f071fc6ad20dbc0a07ba2ef824605fff5/lib/irrlichtmt/source/Irrlicht -isystem /builds/okias/aports/community/minetest/src/minetest-8093044f071fc6ad20dbc0a07ba2ef824605fff5/lib/lua/src -isystem /builds/okias/aports/community/minetest/src/minetest-8093044f071fc6ad20dbc0a07ba2ef824605fff5/lib/gmp -isystem /builds/okias/aports/community/minetest/src/minetest-8093044f071fc6ad20dbc0a07ba2ef824605fff5/lib/jsoncpp -isystem /builds/okias/aports/community/minetest/src/minetest-8093044f071fc6ad20dbc0a07ba2ef824605fff5/lib/bitop -isystem /usr/include/freetype2 -isystem /usr/include/AL -Os -fstack-clash-protection -Wformat -Werror=format-security -D_GLIBCXX_ASSERTIONS=1 -D_LIBCPP_ENABLE_THREAD_SAFETY_ANNOTATIONS=1 -D_LIBCPP_ENABLE_HARDENED_MODE=1 -DNDEBUG -Wall -Wextra -Wno-unused-parameter  -pipe -funroll-loops -O3 -fomit-frame-pointer -fno-math-errno -fno-trapping-math -fno-signed-zeros -std=gnu++17 -MD -MT src/CMakeFiles/minetest.dir/porting.cpp.o -MF src/CMakeFiles/minetest.dir/porting.cpp.o.d -o src/CMakeFiles/minetest.dir/porting.cpp.o -c /builds/okias/aports/community/minetest/src/minetest-8093044f071fc6ad20dbc0a07ba2ef824605fff5/src/porting.cpp
In file included from /builds/okias/aports/community/minetest/src/minetest-8093044f071fc6ad20dbc0a07ba2ef824605fff5/src/porting.cpp:70:
/builds/okias/aports/community/minetest/src/minetest-8093044f071fc6ad20dbc0a07ba2ef824605fff5/src/util/string.h:86:8: error: declaration of 'size_t mystrlcpy(char*, const char*, size_t) noexcept' has a different exception specifier
   86 | size_t mystrlcpy(char *dst, const char *src, size_t size) noexcept;
      |        ^~~~~~~~~
In file included from /builds/okias/aports/community/minetest/src/minetest-8093044f071fc6ad20dbc0a07ba2ef824605fff5/src/porting.cpp:26:
/builds/okias/aports/community/minetest/src/minetest-8093044f071fc6ad20dbc0a07ba2ef824605fff5/src/porting.h:88:34: note: from previous declaration 'size_t mystrlcpy(char*, const char*, size_t)'
   88 |         #define strlcpy(d, s, n) mystrlcpy(d, s, n)
      |                                  ^~~~~~~~~
ninja: job failed: /usr/bin/g++ -DIRRLICHT_API="" -DUSE_CMAKE_CONFIG_H -Dminetest_EXPORTS -I/builds/okias/aports/community/minetest/src/minetest-8093044f071fc6ad20dbc0a07ba2ef824605fff5/build_client/src -I/builds/okias/aports/community/minetest/src/minetest-8093044f071fc6ad20dbc0a07ba2ef824605fff5/src -I/builds/okias/aports/community/minetest/src/minetest-8093044f071fc6ad20dbc0a07ba2ef824605fff5/src/script -I/builds/okias/aports/community/minetest/src/minetest-8093044f071fc6ad20dbc0a07ba2ef824605fff5/lib/irrlichtmt/include -I/builds/okias/aports/community/minetest/src/minetest-8093044f071fc6ad20dbc0a07ba2ef824605fff5/lib/irrlichtmt/source/Irrlicht -isystem /builds/okias/aports/community/minetest/src/minetest-8093044f071fc6ad20dbc0a07ba2ef824605fff5/lib/lua/src -isystem /builds/okias/aports/community/minetest/src/minetest-8093044f071fc6ad20dbc0a07ba2ef824605fff5/lib/gmp -isystem /builds/okias/aports/community/minetest/src/minetest-8093044f071fc6ad20dbc0a07ba2ef824605fff5/lib/jsoncpp -isystem /builds/okias/aports/community/minetest/src/minetest-8093044f071fc6ad20dbc0a07ba2ef824605fff5/lib/bitop -isystem /usr/include/freetype2 -isystem /usr/include/AL -Os -fstack-clash-protection -Wformat -Werror=format-security -D_GLIBCXX_ASSERTIONS=1 -D_LIBCPP_ENABLE_THREAD_SAFETY_ANNOTATIONS=1 -D_LIBCPP_ENABLE_HARDENED_MODE=1 -DNDEBUG -Wall -Wextra -Wno-unused-parameter  -pipe -funroll-loops -O3 -fomit-frame-pointer -fno-math-errno -fno-trapping-math -fno-signed-zeros -std=gnu++17 -MD -MT src/CMakeFiles/minetest.dir/log.cpp.o -MF src/CMakeFiles/minetest.dir/log.cpp.o.d -o src/CMakeFiles/minetest.dir/log.cpp.o -c /builds/okias/aports/community/minetest/src/minetest-8093044f071fc6ad20dbc0a07ba2ef824605fff5/src/log.cpp
In file included from /builds/okias/aports/community/minetest/src/minetest-8093044f071fc6ad20dbc0a07ba2ef824605fff5/src/settings.h:23,
                 from /builds/okias/aports/community/minetest/src/minetest-8093044f071fc6ad20dbc0a07ba2ef824605fff5/src/log.cpp:26:
/builds/okias/aports/community/minetest/src/minetest-8093044f071fc6ad20dbc0a07ba2ef824605fff5/src/util/string.h:86:8: error: declaration of 'size_t mystrlcpy(char*, const char*, size_t) noexcept' has a different exception specifier
   86 | size_t mystrlcpy(char *dst, const char *src, size_t size) noexcept;
      |        ^~~~~~~~~
In file included from /builds/okias/aports/community/minetest/src/minetest-8093044f071fc6ad20dbc0a07ba2ef824605fff5/src/log.cpp:25:
/builds/okias/aports/community/minetest/src/minetest-8093044f071fc6ad20dbc0a07ba2ef824605fff5/src/porting.h:88:34: note: from previous declaration 'size_t mystrlcpy(char*, const char*, size_t)'
   88 |         #define strlcpy(d, s, n) mystrlcpy(d, s, n)
      |                                  ^~~~~~~~~
ninja: subcommands failed

@okias okias marked this pull request as draft January 17, 2024 20:24
@okias okias marked this pull request as ready for review January 17, 2024 20:33
@okias
Copy link
Contributor Author

okias commented Jan 17, 2024

src/CMakeLists.txt Outdated Show resolved Hide resolved
@okias okias force-pushed the detect-strlcpy branch 4 times, most recently from caf473d to 1b7b34c Compare January 17, 2024 22:58
Linux musl-libc and recent glibc > 2.38 have it.

Signed-off-by: David Heidelberg <david@ixit.cz>
@wsor4035 wsor4035 added the Bugfix 🐛 PRs that fix a bug label Jan 18, 2024
@sfan5 sfan5 merged commit 225aa10 into minetest:master Jan 19, 2024
13 checks passed
@okias okias deleted the detect-strlcpy branch January 19, 2024 15:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants