diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-08-10 22:06:13 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-08-10 22:07:33 +0200 |
| commit | 6f5c6fb6a18083a0d2da8c9b94dd64ed85ed1504 (patch) | |
| tree | 011ca381fa901b6c35acd356f0c32a8ffd23acf5 /pkgs/servers | |
| parent | b94559dc7f88d52faf4b48ef94fd2837941fd13e (diff) | |
| download | nixlib-6f5c6fb6a18083a0d2da8c9b94dd64ed85ed1504.tar nixlib-6f5c6fb6a18083a0d2da8c9b94dd64ed85ed1504.tar.gz nixlib-6f5c6fb6a18083a0d2da8c9b94dd64ed85ed1504.tar.bz2 nixlib-6f5c6fb6a18083a0d2da8c9b94dd64ed85ed1504.tar.lz nixlib-6f5c6fb6a18083a0d2da8c9b94dd64ed85ed1504.tar.xz nixlib-6f5c6fb6a18083a0d2da8c9b94dd64ed85ed1504.tar.zst nixlib-6f5c6fb6a18083a0d2da8c9b94dd64ed85ed1504.zip | |
mariadb: remove darwin patch that no longer applies
Hopefully it isn't needed anymore.
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/sql/mariadb/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/sql/mariadb/my_context_asm.patch | 18 |
2 files changed, 0 insertions, 20 deletions
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 090291e41012..1f9a863bea5b 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -29,8 +29,6 @@ common = rec { # attributes common to both builds sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt ''; - patches = stdenv.lib.optional stdenv.isDarwin ./my_context_asm.patch; - nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ diff --git a/pkgs/servers/sql/mariadb/my_context_asm.patch b/pkgs/servers/sql/mariadb/my_context_asm.patch deleted file mode 100644 index 3a747ed1b03c..000000000000 --- a/pkgs/servers/sql/mariadb/my_context_asm.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/mysys/my_context.c -+++ b/mysys/my_context.c -@@ -206,15 +206,6 @@ my_context_spawn(struct my_context *c, void (*f)(void *), void *d) - ( - "movq %%rsp, (%[save])\n\t" - "movq %[stack], %%rsp\n\t" --#if __GNUC__ >= 4 && __GNUC_MINOR__ >= 4 && !defined(__INTEL_COMPILER) -- /* -- This emits a DWARF DW_CFA_undefined directive to make the return address -- undefined. This indicates that this is the top of the stack frame, and -- helps tools that use DWARF stack unwinding to obtain stack traces. -- (I use numeric constant to avoid a dependency on libdwarf includes). -- */ -- ".cfi_escape 0x07, 16\n\t" --#endif - "movq %%rbp, 8(%[save])\n\t" - "movq %%rbx, 16(%[save])\n\t" - "movq %%r12, 24(%[save])\n\t" |