mariadb: fix darwin build

main
Dmitry Kalinkin 3 years ago
parent 6253ab088a
commit 86db5fef7b
No known key found for this signature in database
GPG Key ID: 5157B3EC8B2CA333
  1. 5
      pkgs/servers/sql/mariadb/default.nix
  2. 12
      pkgs/servers/sql/mariadb/macos-MDEV-26769-regression-fix.patch

@ -44,7 +44,10 @@ common = rec { # attributes common to both builds
patches = [
./cmake-includedir.patch
];
]
# Fixes a build issue as documented on
# https://jira.mariadb.org/browse/MDEV-26769?focusedCommentId=206073&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-206073
++ lib.optional (!stdenv.isLinux) ./macos-MDEV-26769-regression-fix.patch;
cmakeFlags = [
"-DBUILD_CONFIG=mysql_release"

@ -0,0 +1,12 @@
diff -ru a/storage/innobase/include/buf0types.h b/storage/innobase/include/buf0types.h
--- a/storage/innobase/include/buf0types.h 2021-11-17 02:37:32.000000000 -0500
+++ b/storage/innobase/include/buf0types.h 2021-11-17 02:38:50.000000000 -0500
@@ -179,7 +179,7 @@
#include "sux_lock.h"
#ifdef SUX_LOCK_GENERIC
-class page_hash_latch : private rw_lock
+class page_hash_latch : public rw_lock
{
/** Wait for a shared lock */
void read_lock_wait();
Loading…
Cancel
Save