Merge branch 'master' into staging

2 files changed, 83 insertions, 0 deletions

diff --git a/pkgs/tools/filesystems/bonnie/bonnie-homebrew.patch b/pkgs/tools/filesystems/bonnie/bonnie-homebrew.patch
new file mode 100644
index 00000000000..aba80e7938d
--- /dev/null
+++ b/pkgs/tools/filesystems/bonnie/bonnie-homebrew.patch
@@ -0,0 +1,81 @@
+Derivied from a patch distributed with the Homebrew formula:
+https://github.com/Homebrew/homebrew-core/blob/6ae11ea82c00dc8c11297ecc3f06bc33979862d8/Formula/bonnie++.rb
+
+
+Copyright 2009-2016 Homebrew contributors.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+# Changes included in this patchset:
+# 3) Remove the #ifdef _LARGEFILE64_SOURCE macros which not only prohibits the intended functionality of
+#    splitting into 2 GB files for such filesystems but also incorrectly tests for it in the first place.
+#    The ideal fix would be to replace the AC_TRY_RUN() in configure.in if the fail code actually worked.
+#    Files affected: bonnie++.cp
+
+diff --git i/bonnie++.cpp w/bonnie++.cpp
+index 8c5a43a..8a4b3dc 100644
+--- i/bonnie++.cpp
++++ w/bonnie++.cpp
+@@ -294,11 +294,7 @@ int main(int argc, char *argv[])
+       {
+         char *sbuf = _strdup(optarg);
+         char *size = strtok(sbuf, ":");
+-#ifdef _LARGEFILE64_SOURCE
+         file_size = size_from_str(size, "gt");
+-#else
+-        file_size = size_from_str(size, "g");
+-#endif
+         size = strtok(NULL, "");
+         if(size)
+         {
+@@ -384,15 +380,6 @@ int main(int argc, char *argv[])
+     if(file_size % 1024 > 512)
+       file_size = file_size + 1024 - (file_size % 1024);
+   }
+-#ifndef _LARGEFILE64_SOURCE
+-  if(file_size == 2048)
+-    file_size = 2047;
+-  if(file_size > 2048)
+-  {
+-    fprintf(stderr, "Large File Support not present, can't do %dM.\n", file_size);
+-    usage();
+-  }
+-#endif
+   globals.byte_io_size = min(file_size, globals.byte_io_size);
+   globals.byte_io_size = max(0, globals.byte_io_size);
+ 
+@@ -465,14 +452,6 @@ int main(int argc, char *argv[])
+      && (directory_max_size < directory_min_size || directory_max_size < 0
+      || directory_min_size < 0) )
+     usage();
+-#ifndef _LARGEFILE64_SOURCE
+-  if(file_size > (1 << (31 - 20 + globals.io_chunk_bits)) )
+-  {
+-    fprintf(stderr
+-   , "The small chunk size and large IO size make this test impossible in 32bit.\n");
+-    usage();
+-  }
+-#endif
+   if(file_size && globals.ram && (file_size * concurrency) < (globals.ram * 2) )
+   {
+     fprintf(stderr
diff --git a/pkgs/tools/filesystems/bonnie/default.nix b/pkgs/tools/filesystems/bonnie/default.nix
index c120073866d..65a722c7408 100644
--- a/pkgs/tools/filesystems/bonnie/default.nix
+++ b/pkgs/tools/filesystems/bonnie/default.nix
@@ -7,6 +7,8 @@ stdenv.mkDerivation rec {
     sha256 = "0vkl42rsrsy95fc1ykc6g8rsdbnpxayvdaihnnkly1fww1m3hyz2";
   };
 
+  patches = stdenv.lib.optional stdenv.isDarwin ./bonnie-homebrew.patch;
+
   enableParallelBuilding = true;
 
   meta = {