mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-24 02:46:38 +00:00
dae42566db
MySQL 8.0 is a significant iteration after MySQL 5.7. This patch adds it as a parallel build alongside mysql57 (similar to mysql56 and mysql55 before).
19 lines
749 B
Diff
19 lines
749 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${SOURCE_DIR}/include
|
|
+ -E -nostdinc -dI -DMYSQL_ABI_CHECK -I${SOURCE_DIR}/include/nostdinc -I${SOURCE_DIR}/include
|
|
@@ -74,1 +74,1 @@ FOREACH(file ${ABI_HEADERS})
|
|
- COMMAND sed -e "/^# /d"
|
|
+ COMMAND sed -e "/^# /d" -e "/^#include <-nostdinc>$/d"
|
|
--- /dev/null
|
|
+++ b/include/nostdinc/stdint.h
|
|
@@ -0,0 +1,1 @@
|
|
+#include <-nostdinc>
|