Merge #40007: mariadb: Fix mariadb_config include path
This commit is contained in:
commit
89bed5b604
|
@ -34,7 +34,7 @@ common = rec { # attributes common to both builds
|
||||||
sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt
|
sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt
|
||||||
'';
|
'';
|
||||||
|
|
||||||
patches = [ ./cmake-includedir.patch ]
|
patches = [ ./cmake-includedir.patch ./include-dirs-path.patch ]
|
||||||
++ stdenv.lib.optional stdenv.cc.isClang ./clang-isfinite.patch;
|
++ stdenv.lib.optional stdenv.cc.isClang ./clang-isfinite.patch;
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
|
|
13
pkgs/servers/sql/mariadb/include-dirs-path.patch
Normal file
13
pkgs/servers/sql/mariadb/include-dirs-path.patch
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
diff --git a/libmariadb/mariadb_config/mariadb_config.c.in b/libmariadb/mariadb_config/mariadb_config.c.in
|
||||||
|
index 45d2f4e..e5666db 100644
|
||||||
|
--- a/libmariadb/mariadb_config/mariadb_config.c.in
|
||||||
|
+++ b/libmariadb/mariadb_config/mariadb_config.c.in
|
||||||
|
@@ -5,7 +5,7 @@
|
||||||
|
|
||||||
|
static char *mariadb_progname;
|
||||||
|
|
||||||
|
-#define INCLUDE "-I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@ -I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@/mysql"
|
||||||
|
+#define INCLUDE "-I@INSTALL_INCLUDEDIR@ -I@INSTALL_INCLUDEDIR@/mysql"
|
||||||
|
#define LIBS "-L@CMAKE_INSTALL_PREFIX@/@INSTALL_LIBDIR@/ -lmariadb @extra_dynamic_LDFLAGS@"
|
||||||
|
#define LIBS_SYS "@extra_dynamic_LDFLAGS@"
|
||||||
|
#define CFLAGS INCLUDE
|
Loading…
Reference in a new issue