001-cross_compile_fix.patch 1.4 KB

1234567891011121314151617181920212223242526272829303132333435363738
  1. Index: bonnie++-1.97.1/configure
  2. ===================================================================
  3. --- bonnie++-1.97.1.orig/configure
  4. +++ bonnie++-1.97.1/configure
  5. @@ -3955,9 +3955,7 @@ rm -f core conftest.err conftest.$ac_obj
  6. if test "$cross_compiling" = yes; then :
  7. { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  8. -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  9. -as_fn_error $? "cannot run test program while cross compiling
  10. -See \`config.log' for more details" "$LINENO" 5 ; }
  11. +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} }
  12. else
  13. cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  14. /* end confdefs.h. */
  15. Index: bonnie++-1.97.1/Makefile
  16. ===================================================================
  17. --- bonnie++-1.97.1.orig/Makefile
  18. +++ bonnie++-1.97.1/Makefile
  19. @@ -1,5 +1,7 @@
  20. EXES=bonnie++ zcav getc_putc getc_putc_helper
  21. EXE=bon_csv2html generate_randfile
  22. +TARGET_CXX=g++
  23. +TARGET_LINK=g++
  24. all: $(EXE) $(EXES)
  25. @@ -10,8 +12,8 @@ eprefix=${prefix}
  26. #MORE_WARNINGS=-Weffc++
  27. 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)
  28. CFLAGS=-O2 -DNDEBUG $(WFLAGS) $(MORECFLAGS)
  29. -CXX=g++ $(CFLAGS)
  30. -LINK=g++
  31. +CXX=$(TARGET_CXX) $(CFLAGS)
  32. +LINK=$(TARGET_LINK)
  33. THREAD_LFLAGS=-lpthread
  34. INSTALL=/usr/bin/install -c