Unverified Commit bdcacf48 authored by 0x4A6F's avatar 0x4A6F Committed by GitHub
Browse files

mariadb: fix musl build (#394592)

parents 8963802d 3b4d4050

pkgs/servers/sql/mariadb/default.nix

+6 −0
Original line number Diff line number Diff line
@@ -120,10 +120,16 @@ let 
        prePatch = ''

          sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt

        '';

        env = lib.optionalAttrs (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isGnu) {

          # MariaDB uses non-POSIX fopen64, which musl only conditionally defines.

          NIX_CFLAGS_COMPILE = "-D_LARGEFILE64_SOURCE";

        };



        patches =

          [

            ./patch/cmake-includedir.patch

            # patch for musl compatibility

            ./patch/include-cstdint-full.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

pkgs/servers/sql/mariadb/patch/include-cstdint-full.patch

0 → 100644
+48 −0
Original line number Diff line number Diff line 
diff --git a/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h b/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h

index f356395..3215221 100644

--- a/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h

+++ b/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h

@@ -5,6 +5,7 @@

 

 #pragma once

 

+#include <cstdint>

 #include <string>

 #include <vector>

 

diff --git a/storage/rocksdb/rocksdb/util/string_util.h b/storage/rocksdb/rocksdb/util/string_util.h

index a761be6..064d059 100644

--- a/storage/rocksdb/rocksdb/util/string_util.h

+++ b/storage/rocksdb/rocksdb/util/string_util.h

@@ -6,6 +6,7 @@

 

 #pragma once

 

+#include <cstdint>

 #include <sstream>

 #include <string>

 #include <unordered_map>

diff --git a/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h b/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h

index c7f93b4..3c2ab80 100644

--- a/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h

+++ b/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h

@@ -8,6 +8,7 @@

 #pragma once

 #ifndef ROCKSDB_LITE

 

+#include <cstdint>

 #include <string>

 #include <vector>

 #include "rocksdb/status.h"

diff --git a/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h b/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h

index 963c1d8..8d70309 100644

--- a/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h

+++ b/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h

@@ -6,6 +6,7 @@

 #pragma once

 

 #include "rocksdb/rocksdb_namespace.h"

+#include <cstdint>

 

 struct CompactionIterationStats {

   // Compaction statistics