diff options
author | Daiderd Jordan <daiderd@gmail.com> | 2017-04-12 19:51:09 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-12 19:51:09 +0200 |
commit | ce4c9c4d863b41a879a32734b09a090eaaab5280 (patch) | |
tree | 55233a661d4f0bdb2c65db6588edc881f33764dc /pkgs/tools | |
parent | 13a0ad3108c720ebdccaa2a42a67d6ccf9fde8c8 (diff) | |
parent | 4f61dd7581a8ed08ae90c5d617fc12c95f6fc495 (diff) |
Merge pull request #24826 from kirelagin/bonniepp
bonnie: Update Darwin patch
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/filesystems/bonnie/bonnie-homebrew.patch | 90 |
1 files changed, 7 insertions, 83 deletions
diff --git a/pkgs/tools/filesystems/bonnie/bonnie-homebrew.patch b/pkgs/tools/filesystems/bonnie/bonnie-homebrew.patch index e4903143f11c3..aba80e7938dde 100644 --- a/pkgs/tools/filesystems/bonnie/bonnie-homebrew.patch +++ b/pkgs/tools/filesystems/bonnie/bonnie-homebrew.patch @@ -1,3 +1,7 @@ +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 @@ -23,52 +27,15 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # 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 -diff --git i/Makefile w/Makefile -index 4bb5103..8f7ed41 100644 ---- i/Makefile -+++ w/Makefile -@@ -10,8 +10,8 @@ eprefix=${prefix} - #MORE_WARNINGS=-Weffc++ - WFLAGS=-Wall -W -Wshadow -Wpointer-arith -Wwrite-strings -pedantic -ffor-scope -Wcast-align -Wsign-compare -Wpointer-arith -Wwrite-strings -Wformat-security -Wswitch-enum -Winit-self $(MORE_WARNINGS) - CFLAGS=-O2 -DNDEBUG $(WFLAGS) $(MORECFLAGS) --CXX=g++ $(CFLAGS) --LINK=g++ -+CXX=clang++ $(CFLAGS) -+LINK=clang++ - THREAD_LFLAGS=-lpthread - - INSTALL=/usr/bin/install -c diff --git i/bonnie++.cpp w/bonnie++.cpp index 8c5a43a..8a4b3dc 100644 --- i/bonnie++.cpp +++ w/bonnie++.cpp -@@ -73,7 +73,7 @@ public: - void set_io_chunk_size(int size) - { delete m_buf; pa_new(size, m_buf, m_buf_pa); m_io_chunk_size = size; } - void set_file_chunk_size(int size) -- { delete m_buf; m_buf = new char[__max(size, m_io_chunk_size)]; m_file_chunk_size = size; } -+ { delete m_buf; m_buf = new char[max(size, m_io_chunk_size)]; m_file_chunk_size = size; } - - // Return the page-aligned version of the local buffer - char *buf() { return m_buf_pa; } -@@ -138,7 +138,7 @@ CGlobalItems::CGlobalItems(bool *exitFlag) - , m_buf(NULL) - , m_buf_pa(NULL) - { -- pa_new(__max(m_io_chunk_size, m_file_chunk_size), m_buf, m_buf_pa); -+ pa_new(max(m_io_chunk_size, m_file_chunk_size), m_buf, m_buf_pa); - SetName("."); - } - @@ -294,11 +294,7 @@ int main(int argc, char *argv[]) { char *sbuf = _strdup(optarg); @@ -81,7 +48,7 @@ index 8c5a43a..8a4b3dc 100644 size = strtok(NULL, ""); if(size) { -@@ -384,17 +380,8 @@ int main(int argc, char *argv[]) +@@ -384,15 +380,6 @@ int main(int argc, char *argv[]) if(file_size % 1024 > 512) file_size = file_size + 1024 - (file_size % 1024); } @@ -94,13 +61,9 @@ index 8c5a43a..8a4b3dc 100644 - usage(); - } -#endif -- globals.byte_io_size = __min(file_size, globals.byte_io_size); -- globals.byte_io_size = __max(0, globals.byte_io_size); -+ globals.byte_io_size = min(file_size, globals.byte_io_size); -+ globals.byte_io_size = max(0, globals.byte_io_size); + globals.byte_io_size = min(file_size, globals.byte_io_size); + globals.byte_io_size = max(0, globals.byte_io_size); - if(machine == NULL) - { @@ -465,14 +452,6 @@ int main(int argc, char *argv[]) && (directory_max_size < directory_min_size || directory_max_size < 0 || directory_min_size < 0) ) @@ -116,42 +79,3 @@ index 8c5a43a..8a4b3dc 100644 if(file_size && globals.ram && (file_size * concurrency) < (globals.ram * 2) ) { fprintf(stderr -diff --git i/duration.cpp w/duration.cpp -index efa3fd3..f943155 100644 ---- i/duration.cpp -+++ w/duration.cpp -@@ -38,7 +38,7 @@ double Duration_Base::stop() - getTime(&tv); - double ret; - ret = tv - m_start; -- m_max = __max(m_max, ret); -+ m_max = max(m_max, ret); - return ret; - } - -diff --git i/port.h w/port.h -index 8d53622..2e1f112 100644 ---- i/port.h -+++ w/port.h -@@ -49,8 +49,6 @@ typedef struct timeval TIMEVAL_TYPE; - #endif - - typedef int FILE_TYPE; --#define __min min --#define __max max - typedef unsigned int UINT; - typedef unsigned long ULONG; - typedef const char * PCCHAR; -diff --git i/port.h.in w/port.h.in -index 69c8f24..8359d72 100644 ---- i/port.h.in -+++ w/port.h.in -@@ -49,8 +49,6 @@ typedef struct timeval TIMEVAL_TYPE; - #endif - - typedef int FILE_TYPE; --#define __min min --#define __max max - typedef unsigned int UINT; - typedef unsigned long ULONG; - typedef const char * PCCHAR; |