Skip to content

Commit

Permalink
bonnie: 1.97 -> 1.97.3
Browse files Browse the repository at this point in the history
  • Loading branch information
dezgeg committed Apr 9, 2017
1 parent c4bdec7 commit b64163a
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions pkgs/tools/filesystems/bonnie/default.nix
@@ -1,10 +1,10 @@
{ stdenv, fetchurl }:

stdenv.mkDerivation {
name = "bonnie++-1.97";
stdenv.mkDerivation rec {
name = "bonnie++-1.97.3";
src = fetchurl {
url = http://www.coker.com.au/bonnie++/experimental/bonnie++-1.97.tgz;
sha256 = "10jrqgvacvblyqv38pg5jb9jspyisxaladcrp8k6b2k46xcs1xa4";
url = "http://www.coker.com.au/bonnie++/experimental/${name}.tgz";
sha256 = "0vkl42rsrsy95fc1ykc6g8rsdbnpxayvdaihnnkly1fww1m3hyz2";
};

patches = stdenv.lib.optional stdenv.isDarwin ./bonnie-homebrew.patch;
Expand Down

3 comments on commit b64163a

@copumpkin
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kirelagin @dezgeg it looks like that bonnie-homebrew.patch no longer applies. If I take it out, the build seems to pass but I don't know if the resulting executable actually works. @kirelagin I'm going to push the "fix" (since it doesn't even build now on Darwin) but do you mind double checking if the build is sensible?

@kirelagin
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@copumpkin Ok, I’ll fix the patch.

# Changes included in this patchset:
# 1) Explicitly use clang/clang++ in Makefile
# 2) __min() and __max() macros break bon_csv2html.cpp: "redefinition of 'min' as different kind of symbol"
#    Remove the construct in favor of macro targets min()/max() provided by the library
#    Files affected: port.h.in port.h duration.cpp bonnie++.cpp
# 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

Looks like 2 got fully integrated upstream. I have no idea whether 3 is actually useful, but I suppose so.

What are your thoughts on 1? I’m not really familiar with the way compiler detection works in stdenv on macos. Is this change necessary?

@kirelagin
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, wait a second, in 1) they patch Makefile wtf??

configure properly picks up clang++ from the CXX environment variable, so I guess there is no need to touch that.

Please sign in to comment.