mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-28 16:42:09 +00:00
mariadb: remove darwin patch that no longer applies
Hopefully it isn't needed anymore.
This commit is contained in:
parent
b94559dc7f
commit
6f5c6fb6a1
|
@ -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
|
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 ];
|
nativeBuildInputs = [ cmake pkgconfig ];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
|
|
@ -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"
|
|
Loading…
Reference in a new issue