Re: [ptxdist] [PATCH v2 1/1] bonnie++: Bump to version 1.97

[Michael Olbrich <m.olbrich@pengutronix.de>]

On Mon, Apr 27, 2015 at 01:24:33PM +0200, Alexander Stein wrote:
> This version needs a patch for autoconf to avoid runtime checks when
> cross-compiling.

Thanks, applied. I did some more cleanup. Hopefully I didn't break
anything... :-)

Michael

> Signed-off-by: Alexander Stein <alexander.stein@systec-electronic.com>
> ---
>  ...configure-cache-result-of-large-file-test.patch | 32 ++++++++++++++++++++++
>  patches/bonnie++-1.97/autogen.sh                   |  1 +
>  patches/bonnie++-1.97/series                       |  4 +++
>  rules/bonniexx.make                                | 10 ++++---
>  4 files changed, 43 insertions(+), 4 deletions(-)
>  create mode 100644 patches/bonnie++-1.97/0001-configure-cache-result-of-large-file-test.patch
>  create mode 120000 patches/bonnie++-1.97/autogen.sh
>  create mode 100644 patches/bonnie++-1.97/series
> 
> diff --git a/patches/bonnie++-1.97/0001-configure-cache-result-of-large-file-test.patch b/patches/bonnie++-1.97/0001-configure-cache-result-of-large-file-test.patch
> new file mode 100644
> index 0000000..adf144f
> --- /dev/null
> +++ b/patches/bonnie++-1.97/0001-configure-cache-result-of-large-file-test.patch
> @@ -0,0 +1,32 @@
> +From: Alexander Stein <alexander.stein@systec-electronic.com>
> +Date: Mon, 27 Apr 2015 13:22:58 +0200
> +Subject: [PATCH] configure: cache result of large file test
> +
> +Signed-off-by: Alexander Stein <alexander.stein@systec-electronic.com>
> +---
> + configure.in | 5 +++--
> + 1 file changed, 3 insertions(+), 2 deletions(-)
> +
> +diff --git a/configure.in b/configure.in
> +index f92f0ab8ea8f..f156f0b8d8c5 100644
> +--- a/configure.in
> ++++ b/configure.in
> +@@ -83,6 +83,7 @@ void * thread_func(void * param) { return NULL; }
> +   , thread_ldflags="-pthread")
> + 
> + AC_SUBST(large_file)
> ++AC_CACHE_CHECK([Large file support], bonnie_cv_sys_largefile,
> + AC_TRY_RUN([#ifndef _LARGEFILE64_SOURCE
> + #define _LARGEFILE64_SOURCE
> + #endif
> +@@ -118,8 +119,8 @@ int main () {
> +   }
> +   close(fd);
> +   return 0;
> +-}], large_file="yes")
> +-if [[ -n "$large_file" ]]; then
> ++}], large_file="yes"))
> ++if [[ "x$bonnie_cv_sys_largefile" = "xyes" ]] || [[ -n "$large_file" ]]; then
> +    large_file="#define _LARGEFILE64_SOURCE"
> + fi
> + 
> diff --git a/patches/bonnie++-1.97/autogen.sh b/patches/bonnie++-1.97/autogen.sh
> new file mode 120000
> index 0000000..9f8a4cb
> --- /dev/null
> +++ b/patches/bonnie++-1.97/autogen.sh
> @@ -0,0 +1 @@
> +../autogen.sh
> \ No newline at end of file
> diff --git a/patches/bonnie++-1.97/series b/patches/bonnie++-1.97/series
> new file mode 100644
> index 0000000..9b7237c
> --- /dev/null
> +++ b/patches/bonnie++-1.97/series
> @@ -0,0 +1,4 @@
> +# generated by git-ptx-patches
> +#tag:base --start-number 1
> +0001-configure-cache-result-of-large-file-test.patch
> +# fed4790f562b273d16ba0fc3f085bb40  - git-ptx-patches magic
> diff --git a/rules/bonniexx.make b/rules/bonniexx.make
> index 440975d..fa35442 100644
> --- a/rules/bonniexx.make
> +++ b/rules/bonniexx.make
> @@ -17,11 +17,11 @@ PACKAGES-$(PTXCONF_BONNIEXX) += bonniexx
>  #
>  # Paths and names
>  #
> -BONNIEXX_VERSION	:= 1.03e
> -BONNIEXX_MD5		:= 750aa5b5051263a99c6c195888c74968
> +BONNIEXX_VERSION	:= 1.97
> +BONNIEXX_MD5		:= d6cf9703242998b2ddc2d875b028b3c6
>  BONNIEXX		:= bonnie++-$(BONNIEXX_VERSION)
>  BONNIEXX_SUFFIX		:= tgz
> -BONNIEXX_URL		:= http://www.coker.com.au/bonnie++/$(BONNIEXX).$(BONNIEXX_SUFFIX)
> +BONNIEXX_URL		:= http://www.coker.com.au/bonnie++/experimental/$(BONNIEXX).$(BONNIEXX_SUFFIX)
>  BONNIEXX_SOURCE		:= $(SRCDIR)/$(BONNIEXX).$(BONNIEXX_SUFFIX)
>  BONNIEXX_DIR		:= $(BUILDDIR)/$(BONNIEXX)
>  BONNIEXX_LICENSE	:= GPLv2
> @@ -31,7 +31,9 @@ BONNIEXX_LICENSE	:= GPLv2
>  # ----------------------------------------------------------------------------
>  
>  BONNIEXX_PATH	  := PATH=$(CROSS_PATH)
> -BONNIEXX_ENV 	  := $(CROSS_ENV)
> +BONNIEXX_ENV 	  := \
> +		$(CROSS_ENV) \
> +		bonnie_cv_sys_largefile=$(call ptx/ifdef, PTXCONF_GLOBAL_LARGE_FILE,yes,no)
>  
>  #
>  # autoconf
> -- 
> 2.0.5
> 
> 
> -- 
> ptxdist mailing list
> ptxdist@pengutronix.de

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de