diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2014-08-30 23:49:53 +0400 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2014-08-30 23:49:53 +0400 |
| commit | a539ec889cfa5e0228249166ed2b5832f6d9d138 (patch) | |
| tree | 3e7e09eb908c237e9cd9c3a7ad640ab398c09998 /pkgs | |
| parent | d593d3ac8810179501a8c8d404c0d19c06265510 (diff) | |
| parent | 1e06594c0c70f618887e1ddaba35b4e165b448d5 (diff) | |
| download | nixlib-a539ec889cfa5e0228249166ed2b5832f6d9d138.tar nixlib-a539ec889cfa5e0228249166ed2b5832f6d9d138.tar.gz nixlib-a539ec889cfa5e0228249166ed2b5832f6d9d138.tar.bz2 nixlib-a539ec889cfa5e0228249166ed2b5832f6d9d138.tar.lz nixlib-a539ec889cfa5e0228249166ed2b5832f6d9d138.tar.xz nixlib-a539ec889cfa5e0228249166ed2b5832f6d9d138.tar.zst nixlib-a539ec889cfa5e0228249166ed2b5832f6d9d138.zip | |
Merge pull request #2453 from pmahoney/mariadb-osx
MariaDB on OS X
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/servers/sql/mariadb/default.nix | 17 | ||||
| -rw-r--r-- | pkgs/servers/sql/mariadb/my_context_asm.patch | 18 |
2 files changed, 33 insertions, 2 deletions
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index bb0c0bc8da86..0efdd542fa4e 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, ncurses, openssl, bison, boost, libxml2, libaio, judy, libevent, groff }: +{ stdenv, fetchurl, cmake, ncurses, openssl, bison, boost, libxml2, libaio, judy, libevent, groff, perl, fixDarwinDylibNames }: stdenv.mkDerivation rec { name = "mariadb-${version}"; @@ -9,12 +9,25 @@ stdenv.mkDerivation rec { sha256 = "039wz89vs03a27anpshj5xaqknm7cqi7mrypvwingqkq26ns0mhs"; }; - buildInputs = [ cmake ncurses openssl bison boost libxml2 libaio judy libevent groff ]; + buildInputs = [ cmake ncurses openssl bison boost libxml2 judy libevent groff ] + ++ stdenv.lib.optional (!stdenv.isDarwin) libaio + ++ stdenv.lib.optionals stdenv.isDarwin [ perl fixDarwinDylibNames ]; + + patches = stdenv.lib.optional stdenv.isDarwin ./my_context_asm.patch; cmakeFlags = [ "-DWITH_READLINE=yes" "-DWITH_EMBEDDED_SERVER=yes" "-DINSTALL_SCRIPTDIR=bin" ]; enableParallelBuilding = true; + prePatch = '' + substituteInPlace cmake/libutils.cmake \ + --replace /usr/bin/libtool libtool + ''; + postInstall = '' + substituteInPlace $out/bin/mysql_install_db \ + --replace basedir=\"\" basedir=\"$out\" + ''; + passthru.mysqlVersion = "5.5"; meta = { diff --git a/pkgs/servers/sql/mariadb/my_context_asm.patch b/pkgs/servers/sql/mariadb/my_context_asm.patch new file mode 100644 index 000000000000..3a747ed1b03c --- /dev/null +++ b/pkgs/servers/sql/mariadb/my_context_asm.patch @@ -0,0 +1,18 @@ +--- 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" |