From patchwork Sat Sep 29 15:09:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gilles Talis X-Patchwork-Id: 976634 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="sZZs3RP3"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42MsQm5NBSz9sBJ for ; Sun, 30 Sep 2018 01:09:36 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 9752F88EEE; Sat, 29 Sep 2018 15:09:33 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ThUc4Ynyx207; Sat, 29 Sep 2018 15:09:31 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 5B6AB88EEA; Sat, 29 Sep 2018 15:09:31 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 4945B1C2C64 for ; Sat, 29 Sep 2018 15:09:23 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 4401A87678 for ; Sat, 29 Sep 2018 15:09:23 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id jBrxNOq1jURM for ; Sat, 29 Sep 2018 15:09:22 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by whitealder.osuosl.org (Postfix) with ESMTPS id B0C2D87691 for ; Sat, 29 Sep 2018 15:09:21 +0000 (UTC) Received: by mail-wm1-f46.google.com with SMTP id s12-v6so4802563wmc.0 for ; Sat, 29 Sep 2018 08:09:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Lju/t0HWGlaUPbl5pEnI2+eHrmtq08u/iac39BkY5pA=; b=sZZs3RP3KXXSBUh0qrMqYuAOWs45YawsW4kE4Z7Vg8CIjuaJYVNSYBqXLzj4DaxpnF dL6VO1ELjPqvq42szqHgR9x+wgCXp3/fx0qAyQD+9qBH/ixopG39Xom+Zg1uuoCf4O1l Z1EsQEGzaAnOqFOu8vpYPnjK0p6JKvR3AlihiKbj7w4d0p/iUYeEL3KTRLnvR+fKW5eq UiewxMeJycDevHV5aFRZkRGDpmjdILxF2ZjZoI4B4q6MNexXlLFHk+J05Ai9ECnlyaSf 4L0v8Ac5d937d9ITQpSB3nT2prngD65syecLaTbmnVmGk6lpCPEMceQIaN7nV1fNq442 sxtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Lju/t0HWGlaUPbl5pEnI2+eHrmtq08u/iac39BkY5pA=; b=XhQvijkM0yst7XXbGvKMIyKlKEbCJRkpbGlnAQX8unTnRGlB0XL/EbC17/VJwEegN9 0SSpHPzKgExDBEaY2n4a6Wl8VgCg3Qtz1sk9D0ZAdMnIWCxy7qkXKwmI6ZKj999FgHcN 8gAq2RUCwNL0sFi4LI2Yjr4oosc3ckb8G4Dw94kBi7F7NsZm4eA5/hZMDgxdRt3PWHZF DDyMFxWlH5flEBLvGIhFVk32KZYQWMYglCRw535NfM5g4Dto03xJOqMHrTyTciov7qQj 9YWbmI73o/K8kQ8lEs/et/tnzrLMJDpaDAM3X87pGFsuVehzYS2W/0OkixpgA0gbwUJY dakg== X-Gm-Message-State: ABuFfojedTuk+CCuzC/qn3KvTzZTAgotii3luyCWgBxfLTxAsWEqLveG BufxGh02/dA54qfgHI+E2N8hd0dQ X-Google-Smtp-Source: ACcGV61CFFrwAmvhjf2VK/A870kC0AISvybcvn+6ex9PgDqRWOQikKazPD06L6fdr3BL3IepdTFtNA== X-Received: by 2002:a1c:3a41:: with SMTP id h62-v6mr4776063wma.72.1538233759775; Sat, 29 Sep 2018 08:09:19 -0700 (PDT) Received: from localhost.localdomain (232.240.21.93.rev.sfr.net. [93.21.240.232]) by smtp.gmail.com with ESMTPSA id z8-v6sm4161651wmf.19.2018.09.29.08.09.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 29 Sep 2018 08:09:18 -0700 (PDT) From: Gilles Talis To: buildroot@buildroot.org Date: Sat, 29 Sep 2018 17:09:04 +0200 Message-Id: <1538233744-7607-7-git-send-email-gilles.talis@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1538233744-7607-1-git-send-email-gilles.talis@gmail.com> References: <1538233744-7607-1-git-send-email-gilles.talis@gmail.com> Subject: [Buildroot] [PATCH 6/6] iozone: bump to version 3_482 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: gilles.talis@gmail.com MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Reworked patch from Gustavo Zacharias to make it apply to this version Signed-off-by: Gilles Talis --- .../iozone/0001-Add-new-targets-for-iozone.patch | 103 +++++++++++++++++++++ package/iozone/0001-targets.patch | 92 ------------------ package/iozone/iozone.hash | 2 +- package/iozone/iozone.mk | 2 +- 4 files changed, 105 insertions(+), 94 deletions(-) create mode 100644 package/iozone/0001-Add-new-targets-for-iozone.patch delete mode 100644 package/iozone/0001-targets.patch diff --git a/package/iozone/0001-Add-new-targets-for-iozone.patch b/package/iozone/0001-Add-new-targets-for-iozone.patch new file mode 100644 index 0000000..e6bfc18 --- /dev/null +++ b/package/iozone/0001-Add-new-targets-for-iozone.patch @@ -0,0 +1,103 @@ +From 1584ffbfda3277b82997b9f1e0ef31a7061560e0 Mon Sep 17 00:00:00 2001 +From: Gustavo Zacarias +Date: Sun, 26 Aug 2018 18:39:06 +0200 +Subject: [PATCH] Add new targets for iozone: + +linux-noaio is for linux targets without AIO (use case: uClibc) +linux-noth is for linux target without threads or AIO + +And make largefile support optional via CFLAGS. + +Signed-off-by: Gustavo Zacarias +Signed-off-by: Gilles Talis +--- + 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 +--- a/src/current/makefile ++++ b/src/current/makefile +@@ -168,10 +168,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) $(CFLAGS) $(LDFLAGS) iozone_linux.o libasync.o libbif.o \ ++ -lpthread -lrt -o iozone ++ $(CC) $(CFLAGS) -Dlinux fileop_linux.o -o fileop ++ $(CC) $(CFLAGS) -Dlinux pit_server.o -o pit_server ++ ++# ++# GNU 'C' compiler Linux build with threads, largefiles ++# ++linux-noaio: iozone_linux-noaio.o libbif.o fileop_linux.o pit_server.o ++ $(CC) $(CFLAGS) $(LDFLAGS) iozone_linux-noaio.o libbif.o \ ++ -lpthread -lrt -o iozone ++ $(CC) $(CFLAGS) -Dlinux fileop_linux.o -o fileop ++ $(CC) $(CFLAGS) -Dlinux pit_server.o -o pit_server ++ ++# ++# GNU 'C' compiler Linux build with largefiles ++# ++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) $(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 + @echo "" + @echo "Building iozone for Linux" + @echo "" +- $(CC) -Wmissing-prototypes -Wall -c -O3 -Dunix -DHAVE_ANSIC_C -DASYNC_IO -DHAVE_PREAD \ +- -DSHARED_MEM -Dlinux -D_LARGEFILE64_SOURCE $(CFLAGS) iozone.c \ ++ $(CC) -Wmissing-prototypes -Wall -c -Dunix -DHAVE_ANSIC_C -DASYNC_IO -DHAVE_PREAD \ ++ -DSHARED_MEM -Dlinux $(CFLAGS) iozone.c \ + -DNAME='"linux"' -o iozone_linux.o +- $(CC) -Wmissing-prototypes -Wall -c -O3 -Dunix -DHAVE_ANSIC_C -DASYNC_IO -D_LARGEFILE64_SOURCE \ ++ $(CC) -Wmissing-prototypes -Wall -c -Dunix -DHAVE_ANSIC_C -DASYNC_IO \ ++ -DSHARED_MEM -Dlinux $(CFLAGS) libbif.c -o libbif.o ++ $(CC) -Wmissing-prototypes -Wall -c -Dunix -Dlinux -DHAVE_ANSIC_C -DASYNC_IO \ ++ $(CFLAGS) libasync.c -o libasync.o ++ ++iozone_linux-noaio.o: iozone.c libbif.c ++ @echo "" ++ @echo "Building iozone for Linux no AIO" ++ @echo "" ++ $(CC) -Wmissing-prototypes -Wall -c -Dunix -DHAVE_ANSIC_C -DHAVE_PREAD \ ++ -DSHARED_MEM -Dlinux $(CFLAGS) iozone.c \ ++ -DNAME='"linux"' -o iozone_linux-noaio.o ++ $(CC) -Wmissing-prototypes -Wall -c -Dunix -DHAVE_ANSIC_C \ ++ -DSHARED_MEM -Dlinux $(CFLAGS) libbif.c -o libbif.o ++ ++iozone_linux-noth.o: iozone.c libbif.c ++ @echo "" ++ @echo "Building iozone for Linux with no threads" ++ @echo "" ++ $(CC) -Wmissing-prototypes -Wall -c -Dunix -DHAVE_ANSIC_C -DNO_THREADS -DHAVE_PREAD \ ++ -DSHARED_MEM -Dlinux $(CFLAGS) iozone.c \ ++ -DNAME='"linux"' -o iozone_linux-noth.o ++ $(CC) -Wmissing-prototypes -Wall -c -Dunix -DHAVE_ANSIC_C -DNO_THREADS \ + -DSHARED_MEM -Dlinux $(CFLAGS) libbif.c -o libbif.o +- $(CC) -Wmissing-prototypes -Wall -c -O3 -Dunix -Dlinux -DHAVE_ANSIC_C -DASYNC_IO \ +- -D_LARGEFILE64_SOURCE $(CFLAGS) libasync.c -o libasync.o + + fileop_AIX.o: fileop.c + @echo "" +@@ -924,7 +962,7 @@ fileop_linux.o: fileop.c + @echo "" + @echo "Building fileop for Linux" + @echo "" +- $(CC) -Wall -c -O3 $(CFLAGS) fileop.c -o fileop_linux.o ++ $(CC) -Wall -c $(CFLAGS) fileop.c -o fileop_linux.o + + fileop_openbsd.o: fileop.c + @echo "" +-- +2.7.4 + diff --git a/package/iozone/0001-targets.patch b/package/iozone/0001-targets.patch deleted file mode 100644 index 258b960..0000000 --- a/package/iozone/0001-targets.patch +++ /dev/null @@ -1,92 +0,0 @@ -Add new targets for iozone: - -linux-noaio is for linux targets without AIO (use case: uClibc) -linux-noth is for linux target without threads or AIO - -And make largefile support optional via CFLAGS. - -Signed-off-by: Gustavo Zacarias - -diff -Nura iozone3_414.orig/src/current/makefile iozone3_414/src/current/makefile ---- iozone3_414.orig/src/current/makefile 2013-06-11 09:48:18.257837091 -0300 -+++ iozone3_414/src/current/makefile 2013-06-11 13:05:56.338162144 -0300 -@@ -166,10 +166,28 @@ - # 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) $(CFLAGS) $(LDFLAGS) iozone_linux.o libasync.o libbif.o \ -+ -lpthread -lrt -o iozone -+ $(CC) $(CFLAGS) -Dlinux fileop_linux.o -o fileop -+ $(CC) $(CFLAGS) -Dlinux pit_server.o -o pit_server -+ -+# -+# GNU 'C' compiler Linux build with threads, largefiles -+# -+linux-noaio: iozone_linux-noaio.o libbif.o fileop_linux.o pit_server.o -+ $(CC) $(CFLAGS) $(LDFLAGS) iozone_linux-noaio.o libbif.o \ -+ -lpthread -lrt -o iozone -+ $(CC) $(CFLAGS) -Dlinux fileop_linux.o -o fileop -+ $(CC) $(CFLAGS) -Dlinux pit_server.o -o pit_server -+ -+# -+# GNU 'C' compiler Linux build with largefiles -+# -+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) $(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 -@@ -795,13 +813,33 @@ - @echo "" - @echo "Building iozone for Linux" - @echo "" -- $(CC) -Wall -c -O3 -Dunix -DHAVE_ANSIC_C -DASYNC_IO -DHAVE_PREAD \ -- -DSHARED_MEM -Dlinux -D_LARGEFILE64_SOURCE $(CFLAGS) iozone.c \ -+ $(CC) -Wall -c -Dunix -DHAVE_ANSIC_C -DASYNC_IO -DHAVE_PREAD \ -+ -DSHARED_MEM -Dlinux $(CFLAGS) iozone.c \ - -DNAME='"linux"' -o iozone_linux.o -- $(CC) -Wall -c -O3 -Dunix -DHAVE_ANSIC_C -DASYNC_IO -D_LARGEFILE64_SOURCE \ -+ $(CC) -Wall -c -Dunix -DHAVE_ANSIC_C -DASYNC_IO \ -+ -DSHARED_MEM -Dlinux $(CFLAGS) libbif.c -o libbif.o -+ $(CC) -Wall -c -Dunix -Dlinux -DHAVE_ANSIC_C -DASYNC_IO \ -+ $(CFLAGS) libasync.c -o libasync.o -+ -+iozone_linux-noaio.o: iozone.c libbif.c -+ @echo "" -+ @echo "Building iozone for Linux no AIO" -+ @echo "" -+ $(CC) -Wall -c -Dunix -DHAVE_ANSIC_C -DHAVE_PREAD \ -+ -DSHARED_MEM -Dlinux $(CFLAGS) iozone.c \ -+ -DNAME='"linux"' -o iozone_linux-noaio.o -+ $(CC) -Wall -c -Dunix -DHAVE_ANSIC_C \ -+ -DSHARED_MEM -Dlinux $(CFLAGS) libbif.c -o libbif.o -+ -+iozone_linux-noth.o: iozone.c libbif.c -+ @echo "" -+ @echo "Building iozone for Linux with no threads" -+ @echo "" -+ $(CC) -Wall -c -Dunix -DHAVE_ANSIC_C -DNO_THREADS -DHAVE_PREAD \ -+ -DSHARED_MEM -Dlinux $(CFLAGS) iozone.c \ -+ -DNAME='"linux"' -o iozone_linux-noth.o -+ $(CC) -Wall -c -Dunix -DHAVE_ANSIC_C -DNO_THREADS \ - -DSHARED_MEM -Dlinux $(CFLAGS) libbif.c -o libbif.o -- $(CC) -Wall -c -O3 -Dunix -Dlinux -DHAVE_ANSIC_C -DASYNC_IO \ -- -D_LARGEFILE64_SOURCE $(CFLAGS) libasync.c -o libasync.o - - fileop_AIX.o: fileop.c - @echo "" -@@ -893,7 +931,7 @@ - @echo "" - @echo "Building fileop for Linux" - @echo "" -- $(CC) -Wall -c -O3 $(CFLAGS) fileop.c -o fileop_linux.o -+ $(CC) -Wall -c $(CFLAGS) fileop.c -o fileop_linux.o - - fileop_openbsd.o: fileop.c - @echo "" diff --git a/package/iozone/iozone.hash b/package/iozone/iozone.hash index b387588..8f552ba 100644 --- a/package/iozone/iozone.hash +++ b/package/iozone/iozone.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 bbbda98d7c052d8654ea23fb2187d831107ab4ac89842fa21509276d9a6915f0 iozone3_446.tar +sha256 2733feb63c96f77177c68f3d938f2294d5394d8554b2767c45cbe138b2f3ae30 iozone3_482.tar diff --git a/package/iozone/iozone.mk b/package/iozone/iozone.mk index 477a60a..05b3973 100644 --- a/package/iozone/iozone.mk +++ b/package/iozone/iozone.mk @@ -4,7 +4,7 @@ # ################################################################################ -IOZONE_VERSION = 3_446 +IOZONE_VERSION = 3_482 IOZONE_SOURCE = iozone$(IOZONE_VERSION).tar IOZONE_SITE = http://www.iozone.org/src/current IOZONE_LICENSE = IOzone license (NO DERIVED WORKS ALLOWED)