Message ID | 20211010094051.108966-1-gilles.talis@gmail.com |
---|---|
State | Accepted |
Headers | show |
Series | package/iozone: bump to version 3_492 | expand |
On 10/10/2021 11:40, Gilles Talis wrote: > Reworked existing patch to make it apply to this version > > Signed-off-by: Gilles Talis <gilles.talis@gmail.com> > --- > .../0001-Add-new-targets-for-iozone.patch | 22 +++++++++---------- > package/iozone/iozone.hash | 2 +- > package/iozone/iozone.mk | 4 ++-- > 3 files changed, 14 insertions(+), 14 deletions(-) > > diff --git a/package/iozone/0001-Add-new-targets-for-iozone.patch b/package/iozone/0001-Add-new-targets-for-iozone.patch > index e6bfc18de6..3cc184ec8f 100644 > --- a/package/iozone/0001-Add-new-targets-for-iozone.patch > +++ b/package/iozone/0001-Add-new-targets-for-iozone.patch > @@ -1,6 +1,6 @@ > -From 1584ffbfda3277b82997b9f1e0ef31a7061560e0 Mon Sep 17 00:00:00 2001 > +From 5b1e973b2333e838624abf195b3ba9716591f304 Mon Sep 17 00:00:00 2001 > From: Gustavo Zacarias <gustavo@zacarias.com.ar> > -Date: Sun, 26 Aug 2018 18:39:06 +0200 > +Date: Sun, 10 Oct 2021 10:15:26 +0200 > Subject: [PATCH] Add new targets for iozone: It would be nice to send that patch upstream. Or check if it's even still needed. The largefile part, for example, is not needed any more. And maybe uClibc supports aio now. Anyway, applied to master, thanks. Regards, Arnout > > linux-noaio is for linux targets without AIO (use case: uClibc) > @@ -11,18 +11,18 @@ And make largefile support optional via CFLAGS. > Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> > Signed-off-by: Gilles Talis <gilles.talis@gmail.com> > --- > - src/current/makefile | 56 +++++++++++++++++++++++++++++++++++++++++++--------- > + src/current/makefile | 56 +++++++++++++++++++++++++++++++++++++------- > 1 file changed, 47 insertions(+), 9 deletions(-) > > diff --git a/src/current/makefile b/src/current/makefile > -index cfef879..7925e62 100644 > +index 3a54701..3b17b1b 100644 > --- a/src/current/makefile > +++ b/src/current/makefile > -@@ -168,10 +168,28 @@ hpux_no_ansi: iozone_hpux_no.o libbif.o > +@@ -172,10 +172,28 @@ hpux_no_ansi: iozone_hpux_no.o libbif.o > # GNU 'C' compiler Linux build with threads, largefiles, async I/O > # > linux: iozone_linux.o libasync.o libbif.o fileop_linux.o pit_server.o > -- $(CC) -O3 $(LDFLAGS) iozone_linux.o libasync.o libbif.o -lpthread \ > +- $(CC) -O3 $(CFLAGS) iozone_linux.o libasync.o libbif.o -lpthread \ > + $(CC) $(CFLAGS) $(LDFLAGS) iozone_linux.o libasync.o libbif.o \ > + -lpthread -lrt -o iozone > + $(CC) $(CFLAGS) -Dlinux fileop_linux.o -o fileop > @@ -43,14 +43,14 @@ index cfef879..7925e62 100644 > +linux-noth: iozone_linux-noth.o libbif.o fileop_linux.o pit_server.o > + $(CC) $(CFLAGS) $(LDFLAGS) iozone_linux-noth.o libbif.o \ > -lrt -o iozone > -- $(CC) -O3 -Dlinux fileop_linux.o -o fileop > -- $(CC) -O3 -Dlinux pit_server.o -o pit_server > +- $(CC) -O3 $(CFLAGS) -Dlinux fileop_linux.o -o fileop > +- $(CC) -O3 $(CFLAGS) -Dlinux pit_server.o -o pit_server > + $(CC) $(CFLAGS) -Dlinux fileop_linux.o -o fileop > + $(CC) $(CFLAGS) -Dlinux pit_server.o -o pit_server > > # > # GNU 'C' compiler Linux build for powerpc chip with threads, largefiles, async I/O > -@@ -814,13 +832,33 @@ iozone_linux.o: iozone.c libbif.c libasync.c > +@@ -841,13 +859,33 @@ iozone_linux.o: iozone.c libbif.c libasync.c > @echo "" > @echo "Building iozone for Linux" > @echo "" > @@ -89,7 +89,7 @@ index cfef879..7925e62 100644 > > fileop_AIX.o: fileop.c > @echo "" > -@@ -924,7 +962,7 @@ fileop_linux.o: fileop.c > +@@ -951,7 +989,7 @@ fileop_linux.o: fileop.c > @echo "" > @echo "Building fileop for Linux" > @echo "" > @@ -99,5 +99,5 @@ index cfef879..7925e62 100644 > fileop_openbsd.o: fileop.c > @echo "" > -- > -2.7.4 > +2.27.0 > > diff --git a/package/iozone/iozone.hash b/package/iozone/iozone.hash > index 61e8ff3abe..1255392e38 100644 > --- a/package/iozone/iozone.hash > +++ b/package/iozone/iozone.hash > @@ -1,2 +1,2 @@ > # Locally calculated > -sha256 5eadb4235ae2a956911204c50ebf2d8d8d59ddcd4a2841a1baf42f3145ad4fed iozone3_490.tar > +sha256 93c9142d61e6a71ea43b0a266bad7f49f07ce5f5d31b36f8edf4dd386795c483 iozone3_492.tgz > diff --git a/package/iozone/iozone.mk b/package/iozone/iozone.mk > index 32d57ea76e..2282a44eb8 100644 > --- a/package/iozone/iozone.mk > +++ b/package/iozone/iozone.mk > @@ -4,8 +4,8 @@ > # > ################################################################################ > > -IOZONE_VERSION = 3.490 > -IOZONE_SOURCE = iozone$(subst .,_,$(IOZONE_VERSION)).tar > +IOZONE_VERSION = 3.492 > +IOZONE_SOURCE = iozone$(subst .,_,$(IOZONE_VERSION)).tgz > IOZONE_SITE = http://www.iozone.org/src/current > IOZONE_LICENSE = IOzone license (NO DERIVED WORKS ALLOWED) > # IOzone license details can be found at: >
diff --git a/package/iozone/0001-Add-new-targets-for-iozone.patch b/package/iozone/0001-Add-new-targets-for-iozone.patch index e6bfc18de6..3cc184ec8f 100644 --- a/package/iozone/0001-Add-new-targets-for-iozone.patch +++ b/package/iozone/0001-Add-new-targets-for-iozone.patch @@ -1,6 +1,6 @@ -From 1584ffbfda3277b82997b9f1e0ef31a7061560e0 Mon Sep 17 00:00:00 2001 +From 5b1e973b2333e838624abf195b3ba9716591f304 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias <gustavo@zacarias.com.ar> -Date: Sun, 26 Aug 2018 18:39:06 +0200 +Date: Sun, 10 Oct 2021 10:15:26 +0200 Subject: [PATCH] Add new targets for iozone: linux-noaio is for linux targets without AIO (use case: uClibc) @@ -11,18 +11,18 @@ And make largefile support optional via CFLAGS. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Gilles Talis <gilles.talis@gmail.com> --- - src/current/makefile | 56 +++++++++++++++++++++++++++++++++++++++++++--------- + src/current/makefile | 56 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 47 insertions(+), 9 deletions(-) diff --git a/src/current/makefile b/src/current/makefile -index cfef879..7925e62 100644 +index 3a54701..3b17b1b 100644 --- a/src/current/makefile +++ b/src/current/makefile -@@ -168,10 +168,28 @@ hpux_no_ansi: iozone_hpux_no.o libbif.o +@@ -172,10 +172,28 @@ hpux_no_ansi: iozone_hpux_no.o libbif.o # GNU 'C' compiler Linux build with threads, largefiles, async I/O # linux: iozone_linux.o libasync.o libbif.o fileop_linux.o pit_server.o -- $(CC) -O3 $(LDFLAGS) iozone_linux.o libasync.o libbif.o -lpthread \ +- $(CC) -O3 $(CFLAGS) iozone_linux.o libasync.o libbif.o -lpthread \ + $(CC) $(CFLAGS) $(LDFLAGS) iozone_linux.o libasync.o libbif.o \ + -lpthread -lrt -o iozone + $(CC) $(CFLAGS) -Dlinux fileop_linux.o -o fileop @@ -43,14 +43,14 @@ index cfef879..7925e62 100644 +linux-noth: iozone_linux-noth.o libbif.o fileop_linux.o pit_server.o + $(CC) $(CFLAGS) $(LDFLAGS) iozone_linux-noth.o libbif.o \ -lrt -o iozone -- $(CC) -O3 -Dlinux fileop_linux.o -o fileop -- $(CC) -O3 -Dlinux pit_server.o -o pit_server +- $(CC) -O3 $(CFLAGS) -Dlinux fileop_linux.o -o fileop +- $(CC) -O3 $(CFLAGS) -Dlinux pit_server.o -o pit_server + $(CC) $(CFLAGS) -Dlinux fileop_linux.o -o fileop + $(CC) $(CFLAGS) -Dlinux pit_server.o -o pit_server # # GNU 'C' compiler Linux build for powerpc chip with threads, largefiles, async I/O -@@ -814,13 +832,33 @@ iozone_linux.o: iozone.c libbif.c libasync.c +@@ -841,13 +859,33 @@ iozone_linux.o: iozone.c libbif.c libasync.c @echo "" @echo "Building iozone for Linux" @echo "" @@ -89,7 +89,7 @@ index cfef879..7925e62 100644 fileop_AIX.o: fileop.c @echo "" -@@ -924,7 +962,7 @@ fileop_linux.o: fileop.c +@@ -951,7 +989,7 @@ fileop_linux.o: fileop.c @echo "" @echo "Building fileop for Linux" @echo "" @@ -99,5 +99,5 @@ index cfef879..7925e62 100644 fileop_openbsd.o: fileop.c @echo "" -- -2.7.4 +2.27.0 diff --git a/package/iozone/iozone.hash b/package/iozone/iozone.hash index 61e8ff3abe..1255392e38 100644 --- a/package/iozone/iozone.hash +++ b/package/iozone/iozone.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 5eadb4235ae2a956911204c50ebf2d8d8d59ddcd4a2841a1baf42f3145ad4fed iozone3_490.tar +sha256 93c9142d61e6a71ea43b0a266bad7f49f07ce5f5d31b36f8edf4dd386795c483 iozone3_492.tgz diff --git a/package/iozone/iozone.mk b/package/iozone/iozone.mk index 32d57ea76e..2282a44eb8 100644 --- a/package/iozone/iozone.mk +++ b/package/iozone/iozone.mk @@ -4,8 +4,8 @@ # ################################################################################ -IOZONE_VERSION = 3.490 -IOZONE_SOURCE = iozone$(subst .,_,$(IOZONE_VERSION)).tar +IOZONE_VERSION = 3.492 +IOZONE_SOURCE = iozone$(subst .,_,$(IOZONE_VERSION)).tgz IOZONE_SITE = http://www.iozone.org/src/current IOZONE_LICENSE = IOzone license (NO DERIVED WORKS ALLOWED) # IOzone license details can be found at:
Reworked existing patch to make it apply to this version Signed-off-by: Gilles Talis <gilles.talis@gmail.com> --- .../0001-Add-new-targets-for-iozone.patch | 22 +++++++++---------- package/iozone/iozone.hash | 2 +- package/iozone/iozone.mk | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-)