Add missed makefile patches for 5232.

Follow up with rev@5232, we should check in a bunch of makefile patches in order to make it work with arm cross-compiling. But they were missed from the original patch. Signed-off-by: Olof Johansson <[email protected]>
autotest · Feb 21, 2011 · e1c7443 · e1c7443
1 parent 906a8c3
commit e1c7443
Show file tree

Hide file tree

Showing 9 changed files with 97 additions and 2 deletions.
diff --git a/bash_shared_mapping/makefile.patch b/bash_shared_mapping/makefile.patch
@@ -0,0 +1,8 @@
+--- ext3-tools/Makefile.orig	2011-02-07 15:52:18.000000000 -0800
++++ ext3-tools/Makefile	2011-02-07 15:52:23.000000000 -0800
+@@ -1,5 +1,5 @@
+
+-CC	=	gcc
++CC	?=	gcc
+ CFLAGS	+= 	-O -Wall -g -DAIO
+ CXXFLAGS+=	-O -Wall -g
diff --git a/fsfuzzer/makefile.patch b/fsfuzzer/makefile.patch
@@ -0,0 +1,11 @@
+--- fsfuzzer-0.6/Makefile.orig	2011-02-07 19:48:48.000000000 -0800
++++ fsfuzzer-0.6/Makefile	2011-02-07 19:48:57.000000000 -0800
+@@ -15,7 +15,7 @@
+ CFLAGS=-g -W -Wall -Wundef
+ LIBS=
+ all:
+-	gcc $(CFLAGS) mangle.c -o mangle $(LIBS)
++	$(CC) $(CFLAGS) mangle.c -o mangle $(LIBS)
+
+ clean:
+ 	rm -f mangle *.o
diff --git a/fsstress/makefile.patch b/fsstress/makefile.patch
@@ -0,0 +1,9 @@
+--- ext3-tools/Makefile.orig	2011-02-07 15:52:18.000000000 -0800
++++ ext3-tools/Makefile	2011-02-07 15:52:23.000000000 -0800
+@@ -1,5 +1,5 @@
+
+-CC	=	gcc
++CC	?=	gcc
+ CFLAGS	+= 	-O -Wall -g -DAIO
+ CXXFLAGS+=	-O -Wall -g
+
diff --git a/interbench/makefile.patch b/interbench/makefile.patch
@@ -0,0 +1,8 @@
+--- interbench-0.30/Makefile.orig	2011-02-07 19:56:51.000000000 -0800
++++ interbench-0.30/Makefile	2011-02-07 19:57:15.000000000 -0800
+@@ -1,4 +1,4 @@
+-CC=gcc
++CC ?= gcc
+ CFLAGS=-W -Wall -g -O2 -s -pipe
+ LDFLAGS=-lrt -lm
+
diff --git a/iozone/makefile.patch b/iozone/makefile.patch
@@ -0,0 +1,15 @@
+--- iozone3_347/src/current/makefile.orig	2011-02-07 20:00:02.000000000 -0800
++++ iozone3_347/src/current/makefile	2011-02-07 20:01:03.000000000 -0800
+@@ -9,9 +9,9 @@
+ #		convex, FreeBSD, OpenBSD, OSFV3, OSFV4, OSFV5, SCO
+ #		SCO_Unixware_gcc,NetBSD,TRU64, Mac OS X
+
+-CC	= cc
+-C89	= c89
+-GCC	= gcc
++CC	?= cc
++C89	?= c89
++GCC	?= gcc
+ CCS	= /usr/ccs/bin/cc
+ NACC	= /opt/ansic/bin/cc
+ CFLAGS	=
diff --git a/lmbench/0003-makefile.patch b/lmbench/0003-makefile.patch
@@ -0,0 +1,14 @@
+--- lmbench3/src/Makefile.orig	2011-02-07 20:17:46.000000000 -0800
++++ lmbench3/src/Makefile	2011-02-07 20:18:02.000000000 -0800
+@@ -34,9 +34,9 @@
+ # I finally know why Larry Wall's Makefile says "Grrrr".
+ SHELL=/bin/sh
+
+-CC=`../scripts/compiler`
++CC ?= `../scripts/compiler`
+ MAKE=`../scripts/make`
+-AR=ar
++AR ?= ar
+ ARCREATE=cr
+
+ # base of installation location
diff --git a/rmaptest/rmaptest.py b/rmaptest/rmaptest.py
@@ -1,6 +1,5 @@
 import os
-from autotest_lib.client.bin import test
-from autotest_lib.client.common_lib import utils
+from autotest_lib.client.bin import test, utils
 
 
 # tests is a simple array of "cmd" "arguments"

diff --git a/signaltest/Makefile b/signaltest/Makefile
@@ -0,0 +1,12 @@
+
+CC ?= $(CROSS_COMPILE)gcc
+TARGET=signaltest
+FLAGS= -Wall -O2 
+LIBS = -lpthread -lrt
+
+all: signaltest.c
+	$(CC) $(FLAGS) $^ -o $(TARGET) $(LIBS)
+
+clean:
+	rm -f $(TARGET) *.o .depend *.*~
+
diff --git a/tiobench/makefile.patch b/tiobench/makefile.patch
@@ -0,0 +1,19 @@
+--- tiobench-0.3.3/Makefile.orig	2011-02-07 20:32:53.000000000 -0800
++++ tiobench-0.3.3/Makefile	2011-02-07 20:33:02.000000000 -0800
+@@ -1,6 +1,6 @@
+ # Makefile for tiotest
+
+-CC=gcc
++CC?=gcc
+ #CFLAGS=-O3 -fomit-frame-pointer -Wall
+ CFLAGS=-O2 -Wall
+
+@@ -14,7 +14,7 @@ CFLAGS=-O2 -Wall
+
+ #DEFINES=
+
+-LINK=gcc
++LINK=$(CC)
+ EXE=tiotest
+ PROJECT=tiobench
+ # do it once instead of each time referenced