Merge pull request #2126 from lynxis/libmicrohttpd
[feed/packages.git] / utils / bonnie++ / patches / 001-cross_compile_fix.patch
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
7 if test "$cross_compiling" = yes; then :
8 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
9 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
10 -as_fn_error $? "cannot run test program while cross compiling
11 -See \`config.log' for more details" "$LINENO" 5 ; }
12 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} }
13 else
14 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
15 /* end confdefs.h. */
16 Index: bonnie++-1.97.1/Makefile
17 ===================================================================
18 --- bonnie++-1.97.1.orig/Makefile
19 +++ bonnie++-1.97.1/Makefile
20 @@ -1,5 +1,7 @@
21 EXES=bonnie++ zcav getc_putc getc_putc_helper
22 EXE=bon_csv2html generate_randfile
23 +TARGET_CXX=g++
24 +TARGET_LINK=g++
25
26 all: $(EXE) $(EXES)
27
28 @@ -10,8 +12,8 @@ eprefix=${prefix}
29 #MORE_WARNINGS=-Weffc++
30 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)
31 CFLAGS=-O2 -DNDEBUG $(WFLAGS) $(MORECFLAGS)
32 -CXX=g++ $(CFLAGS)
33 -LINK=g++
34 +CXX=$(TARGET_CXX) $(CFLAGS)
35 +LINK=$(TARGET_LINK)
36 THREAD_LFLAGS=-lpthread
37
38 INSTALL=/usr/bin/install -c