From a3bfdabd47101c3c66718e249673e327f4012741 Mon Sep 17 00:00:00 2001 From: "Matthew M. Dean" Date: Sat, 21 Jul 2018 16:02:49 -0700 Subject: [PATCH] bonnie: 1.97.3 Update to fix compilation issues with GCC7 Signed-off-by: Matthew M. Dean --- utils/bonnie++/Makefile | 8 ++++---- utils/bonnie++/patches/001-cross_compile_fix.patch | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/utils/bonnie++/Makefile b/utils/bonnie++/Makefile index 6ae0d4153..b7b72f5c7 100644 --- a/utils/bonnie++/Makefile +++ b/utils/bonnie++/Makefile @@ -8,17 +8,17 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bonnie++ -PKG_VERSION:=1.97 +PKG_VERSION:=1.97.3 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz -PKG_SOURCE_URL:=http://www.coker.com.au/bonnie++/experimental/ -PKG_HASH:=44f5a05937648a6526ba99354555d7d15f2dd392e55d3436f6746da6f6c35982 +PKG_SOURCE_URL:=http://www.coker.com.au/bonnie++/ +PKG_HASH:=e27b386ae0dc054fa7b530aab6bdead7aea6337a864d1f982bc9ebacb320746e PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=copyright.txt PKG_MAINTAINER:=Florian Fainelli -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION).1 +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) include $(INCLUDE_DIR)/package.mk diff --git a/utils/bonnie++/patches/001-cross_compile_fix.patch b/utils/bonnie++/patches/001-cross_compile_fix.patch index 0379fec0b..e3ff56b12 100644 --- a/utils/bonnie++/patches/001-cross_compile_fix.patch +++ b/utils/bonnie++/patches/001-cross_compile_fix.patch @@ -1,7 +1,7 @@ -Index: bonnie++-1.97.1/configure +Index: bonnie++-1.97.3/configure =================================================================== ---- bonnie++-1.97.1.orig/configure -+++ bonnie++-1.97.1/configure +--- bonnie++-1.97.3.orig/configure ++++ bonnie++-1.97.3/configure @@ -3955,9 +3955,7 @@ rm -f core conftest.err conftest.$ac_obj if test "$cross_compiling" = yes; then : @@ -13,10 +13,10 @@ Index: bonnie++-1.97.1/configure else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -Index: bonnie++-1.97.1/Makefile +Index: bonnie++-1.97.3/Makefile =================================================================== ---- bonnie++-1.97.1.orig/Makefile -+++ bonnie++-1.97.1/Makefile +--- bonnie++-1.97.3.orig/Makefile ++++ bonnie++-1.97.3/Makefile @@ -1,5 +1,7 @@ EXES=bonnie++ zcav getc_putc getc_putc_helper EXE=bon_csv2html generate_randfile