From d4b509d7858869730a54b840d978bb44c9e88157 Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Thu, 9 Jan 2025 15:09:08 +0100 Subject: [PATCH] percona-server_8_{0,4}: fix build on aarch64-linux --- pkgs/servers/sql/percona-server/8_0.nix | 1 + pkgs/servers/sql/percona-server/8_4.nix | 1 + .../coredumper-explicitly-import-unistd.patch | 12 ++++++++++++ 3 files changed, 14 insertions(+) create mode 100644 pkgs/servers/sql/percona-server/coredumper-explicitly-import-unistd.patch diff --git a/pkgs/servers/sql/percona-server/8_0.nix b/pkgs/servers/sql/percona-server/8_0.nix index 1ff63364c6a0..1e7946b0b4de 100644 --- a/pkgs/servers/sql/percona-server/8_0.nix +++ b/pkgs/servers/sql/percona-server/8_0.nix @@ -63,6 +63,7 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./no-force-outline-atomics.patch # Do not force compilers to turn on -moutline-atomics switch + ./coredumper-explicitly-import-unistd.patch # fix build on aarch64-linux ]; ## NOTE: MySQL upstream frequently twiddles the invocations of libtool. When updating, you might proactively grep for libtool references. diff --git a/pkgs/servers/sql/percona-server/8_4.nix b/pkgs/servers/sql/percona-server/8_4.nix index 9fef5c2ca522..068c5b946700 100644 --- a/pkgs/servers/sql/percona-server/8_4.nix +++ b/pkgs/servers/sql/percona-server/8_4.nix @@ -71,6 +71,7 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./no-force-outline-atomics.patch # Do not force compilers to turn on -moutline-atomics switch + ./coredumper-explicitly-import-unistd.patch # fix build on aarch64-linux ]; ## NOTE: MySQL upstream frequently twiddles the invocations of libtool. When updating, you might proactively grep for libtool references. diff --git a/pkgs/servers/sql/percona-server/coredumper-explicitly-import-unistd.patch b/pkgs/servers/sql/percona-server/coredumper-explicitly-import-unistd.patch new file mode 100644 index 000000000000..9f3e8f237fb4 --- /dev/null +++ b/pkgs/servers/sql/percona-server/coredumper-explicitly-import-unistd.patch @@ -0,0 +1,12 @@ +diff --git a/extra/coredumper/src/thread_lister.c b/extra/coredumper/src/thread_lister.c +index 15fedac..181889b 100644 +--- a/extra/coredumper/src/thread_lister.c ++++ b/extra/coredumper/src/thread_lister.c +@@ -35,6 +35,7 @@ + + #include /* needed for NULL on some powerpc platforms (?!) */ + #include ++#include + + #include "linuxthreads.h" + /* Include other thread listers here that define THREADS macro