646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
19 lines
797 B
Diff
19 lines
797 B
Diff
MySQL ABI check assumes that with -nostdinc any standard #include terminates
|
|
preprocessing, but we do not provide that:
|
|
https://github.com/NixOS/nixpkgs/issues/44530
|
|
|
|
"#error" does not terminate preprocessing, so we #include a non-existent file instead.
|
|
|
|
--- a/cmake/do_abi_check.cmake
|
|
+++ b/cmake/do_abi_check.cmake
|
|
@@ -68,1 +68,1 @@ FOREACH(file ${ABI_HEADERS})
|
|
- -E -nostdinc -dI -DMYSQL_ABI_CHECK -I${ABI_SOURCE_DIR}/include
|
|
+ -E -nostdinc -dI -DMYSQL_ABI_CHECK -I${ABI_SOURCE_DIR}/include/nostdinc -I${ABI_SOURCE_DIR}/include
|
|
@@ -74,1 +74,1 @@ FOREACH(file ${ABI_HEADERS})
|
|
- COMMAND ${WSL_EXECUTABLE} sed -e "/^# /d"
|
|
+ COMMAND ${WSL_EXECUTABLE} sed -e "/^# /d" -e "/^#include <-nostdinc>$/d"
|
|
--- /dev/null
|
|
+++ b/include/nostdinc/stdint.h
|
|
@@ -0,0 +1,1 @@
|
|
+#include <-nostdinc>
|