From ddc48c3d5ae766f7cc5be6364aabec7545f4d82c Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 27 Apr 2019 17:40:18 -0700 Subject: [PATCH] bonnie++: Remove wrongly added patch during cherry-pick Signed-off-by: Rosen Penev --- .../patches/001-cross_compile_fix.patch | 38 ------------------- 1 file changed, 38 deletions(-) delete mode 100644 utils/bonnie++/patches/001-cross_compile_fix.patch diff --git a/utils/bonnie++/patches/001-cross_compile_fix.patch b/utils/bonnie++/patches/001-cross_compile_fix.patch deleted file mode 100644 index 0379fec0bd..0000000000 --- a/utils/bonnie++/patches/001-cross_compile_fix.patch +++ /dev/null @@ -1,38 +0,0 @@ -Index: bonnie++-1.97.1/configure -=================================================================== ---- bonnie++-1.97.1.orig/configure -+++ bonnie++-1.97.1/configure -@@ -3955,9 +3955,7 @@ rm -f core conftest.err conftest.$ac_obj - - if test "$cross_compiling" = yes; then : - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --as_fn_error $? "cannot run test program while cross compiling --See \`config.log' for more details" "$LINENO" 5 ; } -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} } - else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ -Index: bonnie++-1.97.1/Makefile -=================================================================== ---- bonnie++-1.97.1.orig/Makefile -+++ bonnie++-1.97.1/Makefile -@@ -1,5 +1,7 @@ - EXES=bonnie++ zcav getc_putc getc_putc_helper - EXE=bon_csv2html generate_randfile -+TARGET_CXX=g++ -+TARGET_LINK=g++ - - all: $(EXE) $(EXES) - -@@ -10,8 +12,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=$(TARGET_CXX) $(CFLAGS) -+LINK=$(TARGET_LINK) - THREAD_LFLAGS=-lpthread - - INSTALL=/usr/bin/install -c