On Sun, Feb 05, 2012 at 10:07:02AM +0100, Bernhard Walle wrote:
> The build system of zlib uses 'uname' to determine the operating system
> for which it compiles zlib. However, on non-Linux hosts, this leads to
> wrong results.
> 
> Fixes Darwin (tested on Mac OS 10.7 Lion), doesn't break Linux (verified
> with current Arch Linux on x86_64).
> 
> Signed-off-by: Bernhard Walle <[email protected]>
> ---
> I think that one is okay but just got lost, right?

Ah, yes. I forgot about that. I've merged it now.

Michael

>  rules/zlib.make |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/rules/zlib.make b/rules/zlib.make
> index 0d437e3..e51fe8a 100644
> --- a/rules/zlib.make
> +++ b/rules/zlib.make
> @@ -47,7 +47,8 @@ ZLIB_CONF_ENV := \
>  # autoconf
>  #
>  ZLIB_AUTOCONF := \
> -     --prefix=/usr
> +     --prefix=/usr \
> +     --uname=Linux
>  
>  ifdef PTXCONF_ZLIB_STATIC
>  ZLIB_AUTOCONF += --static
> -- 
> 1.7.9
> 
> 
> -- 
> ptxdist mailing list
> [email protected]
> 

-- 
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
[email protected]

Reply via email to