public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mysql80: init at 8.0.17 (#65221)

Browse Source 
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).
This commit is contained in:
Tim Otten
2019-08-13 19:50:51 +00:00
committed by Orivej Desh (NixOS)
parent a3bf0c2e40
commit dae42566db
4 changed files with 102 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/servers/sql/mysql/abi-check.patch
+18
View File
@@ -0,0 +1,18 @@
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>