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

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

On Tue, Apr 21, 2015 at 11:44:41AM +0200, Alexander Stein wrote:
> This version needs a patch for configure as it fails when cross compiling.

We don't patch configure scripts. You can tell AC_TRY_RUN what to do when
cross-compiling. Either use that to disable this (I think it's the large
file check, right?) or wrap the whole check in a AC_CACHE_CHECK and set the
correct value in the environment.

And then add a autogen.sh link to the patches (like many other packages in
ptxdist).

Michael

> Signed-off-by: Alexander Stein <alexander.stein@systec-electronic.com>
> ---
>  ...igure-Don-t-bail-out-when-cross-compiling.patch | 27 ++++++++++++++++++++++
>  patches/bonnie++-1.97/series                       |  4 ++++
>  rules/bonniexx.make                                |  6 ++---
>  3 files changed, 34 insertions(+), 3 deletions(-)
>  create mode 100644 patches/bonnie++-1.97/0001-configure-Don-t-bail-out-when-cross-compiling.patch
>  create mode 100644 patches/bonnie++-1.97/series
> 
> diff --git a/patches/bonnie++-1.97/0001-configure-Don-t-bail-out-when-cross-compiling.patch b/patches/bonnie++-1.97/0001-configure-Don-t-bail-out-when-cross-compiling.patch
> new file mode 100644
> index 0000000..45a6e72
> --- /dev/null
> +++ b/patches/bonnie++-1.97/0001-configure-Don-t-bail-out-when-cross-compiling.patch
> @@ -0,0 +1,27 @@
> +From: Alexander Stein <alexander.stein@systec-electronic.com>
> +Date: Tue, 21 Apr 2015 09:27:31 +0200
> +Subject: [PATCH] configure: Don't bail out when cross compiling
> +
> +The configure script exits with error when cross compiling. Skipping
> +the tests the package can be build for target.
> +
> +Signed-off-by: Alexander Stein <alexander.stein@systec-electronic.com>
> +---
> + configure | 4 +---
> + 1 file changed, 1 insertion(+), 3 deletions(-)
> +
> +diff --git a/configure b/configure
> +index 4495abe..44086ed 100755
> +--- a/configure
> ++++ b/configure
> +@@ -3955,9 +3955,7 @@ rm -f core conftest.err conftest.$ac_objext \
> + 
> + if test "$cross_compiling" = yes; then :
> +   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
> +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
> +-as_fn_error $? "cannot run test program while cross compiling
> +-See \`config.log' for more details" "$LINENO" 5 ; }
> ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} }
> + else
> +   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> + /* end confdefs.h.  */
> diff --git a/patches/bonnie++-1.97/series b/patches/bonnie++-1.97/series
> new file mode 100644
> index 0000000..d83b18a
> --- /dev/null
> +++ b/patches/bonnie++-1.97/series
> @@ -0,0 +1,4 @@
> +# generated by git-ptx-patches
> +#tag:base --start-number 1
> +0001-configure-Don-t-bail-out-when-cross-compiling.patch
> +# 1492c16fc3a16d9cbc1fa942482a9cf1  - git-ptx-patches magic
> diff --git a/rules/bonniexx.make b/rules/bonniexx.make
> index 440975d..921ce8d 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
> -- 
> 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