Sure, here's the patch in attachment form.
- dale
On Fri, Jan 28, 2011 at 5:00 PM, Lucas Meneghel Rodrigues
<l...@redhat.com>wrote:
> On Fri, 2011-01-21 at 11:06 -0800, Dale Curtis wrote:
> > As mentioned in my unixbench5 patch, here is the parallel make fix that
> was sent
> > upstream applied to 4.1.0.
>
> Dale, apparently your patch arrived the mailing list messed up, I can't
> get it applied to the tree, would you send me an updated version?
>
> > Signed-off-by: Dale Curtis <dalecur...@google.com>
> > ---
> > client/tests/unixbench/Makefile.patch | 28
> +++++++++++++++++++++++++---
> > 1 files changed, 25 insertions(+), 3 deletions(-)
> >
> > diff --git a/client/tests/unixbench/Makefile.patch
> > b/client/tests/unixbench/Makefile.patch
> > index 9d62287..ba672f9 100644
> > --- a/client/tests/unixbench/Makefile.patch
> > +++ b/client/tests/unixbench/Makefile.patch
> > @@ -1,6 +1,5 @@
> > -diff -c -r src/Makefile newsrc/Makefile
> > -*** src/Makefile Wed Jul 28 15:05:02 1999
> > ---- srcnew/Makefile Tue Feb 16 19:43:54 2010
> > +*** unixbench-4.1.0/Makefile Wed Jul 28 15:05:02 1999
> > +--- unixbench-4.1.0.patch/Makefile Fri Jan 21 10:56:32 2011
> > ***************
> > *** 32,50 ****
> > SHELL = /bin/sh
> > @@ -43,3 +42,26 @@ diff -c -r src/Makefile newsrc/Makefile
> >
> > ## Very generic
> > #OPTON = -O
> > +***************
> > +*** 203,212 ****
> > + $(CC) -o $(PROGDIR)/dhry2 ${CFLAGS} ${OPTON} $(SRCDIR)/dhry_1.o
> > $(SRCDIR)/dhry_2.o
> > + cd $(SRCDIR); rm -f dhry_1.o dhry_2.o
> > + $(PROGDIR)/dhry2reg: $(SRCDIR)/dhry_1.c $(SRCDIR)/dhry_2.c
> $(SRCDIR)/dhry.h
> > +! cd $(SRCDIR); $(CC) -c ${CFLAGS} -DREG=register -DHZ=${HZ} ${OPTON}
> dhry_1.c
> > +! cd $(SRCDIR); $(CC) -c ${CFLAGS} -DREG=register -DHZ=${HZ} ${OPTON}
> dhry_2.c
> > +! $(CC) -o $(PROGDIR)/dhry2reg ${CFLAGS} ${OPTON} $(SRCDIR)/dhry_1.o
> > $(SRCDIR)/dhry_2.o
> > +! cd $(SRCDIR); rm -f dhry_1.o dhry_2.o
> > +
> > +
> > + dhry2reg: $(SRCDIR)/dhry_1.c $(SRCDIR)/dhry_2.c $(SRCDIR)/dhry.h
> > +--- 204,213 ----
> > + $(CC) -o $(PROGDIR)/dhry2 ${CFLAGS} ${OPTON} $(SRCDIR)/dhry_1.o
> > $(SRCDIR)/dhry_2.o
> > + cd $(SRCDIR); rm -f dhry_1.o dhry_2.o
> > + $(PROGDIR)/dhry2reg: $(SRCDIR)/dhry_1.c $(SRCDIR)/dhry_2.c
> $(SRCDIR)/dhry.h
> > +! cd $(SRCDIR); $(CC) -c ${CFLAGS} -DREG=register -DHZ=${HZ}
> > ${OPTON} dhry_1.c -o dhry_1_reg.o
> > +! cd $(SRCDIR); $(CC) -c ${CFLAGS} -DREG=register -DHZ=${HZ}
> > ${OPTON} dhry_2.c -o dhry_2_reg.o
> > +! $(CC) -o $(PROGDIR)/dhry2reg ${CFLAGS} ${OPTON}
> > $(SRCDIR)/dhry_1_reg.o $(SRCDIR)/dhry_2_reg.o
> > +! cd $(SRCDIR); rm -f dhry_1_reg.o dhry_2_reg.o
> > +
> > +
> > + dhry2reg: $(SRCDIR)/dhry_1.c $(SRCDIR)/dhry_2.c $(SRCDIR)/dhry.h
>
>
>
From 7a02fc7d944322d83a83cd85e92dcdf838cdddba Mon Sep 17 00:00:00 2001
From: Dale Curtis <dalecur...@google.com>
Date: Fri, 21 Jan 2011 11:00:25 -0800
Subject: [PATCH] Patch unixbench 4.1.0 to support parallel make.
As mentioned in my unixbench5 patch, here is the parallel make fix that was sent
upstream applied to 4.1.0.
Signed-off-by: Dale Curtis <dalecur...@google.com>
---
client/tests/unixbench/Makefile.patch | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/client/tests/unixbench/Makefile.patch b/client/tests/unixbench/Makefile.patch
index 9d62287..ba672f9 100644
--- a/client/tests/unixbench/Makefile.patch
+++ b/client/tests/unixbench/Makefile.patch
@@ -1,6 +1,5 @@
-diff -c -r src/Makefile newsrc/Makefile
-*** src/Makefile Wed Jul 28 15:05:02 1999
---- srcnew/Makefile Tue Feb 16 19:43:54 2010
+*** unixbench-4.1.0/Makefile Wed Jul 28 15:05:02 1999
+--- unixbench-4.1.0.patch/Makefile Fri Jan 21 10:56:32 2011
***************
*** 32,50 ****
SHELL = /bin/sh
@@ -43,3 +42,26 @@ diff -c -r src/Makefile newsrc/Makefile
## Very generic
#OPTON = -O
+***************
+*** 203,212 ****
+ $(CC) -o $(PROGDIR)/dhry2 ${CFLAGS} ${OPTON} $(SRCDIR)/dhry_1.o $(SRCDIR)/dhry_2.o
+ cd $(SRCDIR); rm -f dhry_1.o dhry_2.o
+ $(PROGDIR)/dhry2reg: $(SRCDIR)/dhry_1.c $(SRCDIR)/dhry_2.c $(SRCDIR)/dhry.h
+! cd $(SRCDIR); $(CC) -c ${CFLAGS} -DREG=register -DHZ=${HZ} ${OPTON} dhry_1.c
+! cd $(SRCDIR); $(CC) -c ${CFLAGS} -DREG=register -DHZ=${HZ} ${OPTON} dhry_2.c
+! $(CC) -o $(PROGDIR)/dhry2reg ${CFLAGS} ${OPTON} $(SRCDIR)/dhry_1.o $(SRCDIR)/dhry_2.o
+! cd $(SRCDIR); rm -f dhry_1.o dhry_2.o
+
+
+ dhry2reg: $(SRCDIR)/dhry_1.c $(SRCDIR)/dhry_2.c $(SRCDIR)/dhry.h
+--- 204,213 ----
+ $(CC) -o $(PROGDIR)/dhry2 ${CFLAGS} ${OPTON} $(SRCDIR)/dhry_1.o $(SRCDIR)/dhry_2.o
+ cd $(SRCDIR); rm -f dhry_1.o dhry_2.o
+ $(PROGDIR)/dhry2reg: $(SRCDIR)/dhry_1.c $(SRCDIR)/dhry_2.c $(SRCDIR)/dhry.h
+! cd $(SRCDIR); $(CC) -c ${CFLAGS} -DREG=register -DHZ=${HZ} ${OPTON} dhry_1.c -o dhry_1_reg.o
+! cd $(SRCDIR); $(CC) -c ${CFLAGS} -DREG=register -DHZ=${HZ} ${OPTON} dhry_2.c -o dhry_2_reg.o
+! $(CC) -o $(PROGDIR)/dhry2reg ${CFLAGS} ${OPTON} $(SRCDIR)/dhry_1_reg.o $(SRCDIR)/dhry_2_reg.o
+! cd $(SRCDIR); rm -f dhry_1_reg.o dhry_2_reg.o
+
+
+ dhry2reg: $(SRCDIR)/dhry_1.c $(SRCDIR)/dhry_2.c $(SRCDIR)/dhry.h
--
1.7.3.1
_______________________________________________
Autotest mailing list
Autotest@test.kernel.org
http://test.kernel.org/cgi-bin/mailman/listinfo/autotest
