From mboxrd@z Thu Jan  1 00:00:00 1970
Return-path: <ptxdist-bounces@pengutronix.de>
Received: from mediacenter.hi.pengutronix.de ([2001:6f8:1178:2::65])
	by metis.ext.pengutronix.de with esmtp (Exim 4.72)
	(envelope-from <mol@pengutronix.de>) id 1RuUnP-0003XS-9C
	for ptxdist@pengutronix.de; Mon, 06 Feb 2012 21:04:15 +0100
Received: from mol by mediacenter.hi.pengutronix.de with local (Exim 4.72)
	(envelope-from <mol@pengutronix.de>) id 1RuUnP-0003c1-8K
	for ptxdist@pengutronix.de; Mon, 06 Feb 2012 21:04:15 +0100
Date: Mon, 6 Feb 2012 21:04:15 +0100
From: Michael Olbrich <m.olbrich@pengutronix.de>
Message-ID: <20120206200415.GD32645@pengutronix.de>
References: <1328432822-18280-1-git-send-email-bernhard@bwalle.de>
MIME-Version: 1.0
Content-Disposition: inline
In-Reply-To: <1328432822-18280-1-git-send-email-bernhard@bwalle.de>
Subject: Re: [ptxdist] [PATCH] zlib: Fix build on non-Linux hosts
Reply-To: ptxdist@pengutronix.de
List-Id: PTXdist Development Mailing List <ptxdist.pengutronix.de>
List-Unsubscribe: <http://metis.pengutronix.de/cgi-bin/mailman/options/ptxdist>, 
	<mailto:ptxdist-request@pengutronix.de?subject=unsubscribe>
List-Archive: <http://metis.pengutronix.de/pipermail/ptxdist>
List-Post: <mailto:ptxdist@pengutronix.de>
List-Help: <mailto:ptxdist-request@pengutronix.de?subject=help>
List-Subscribe: <http://metis.pengutronix.de/cgi-bin/mailman/listinfo/ptxdist>, 
	<mailto:ptxdist-request@pengutronix.de?subject=subscribe>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Sender: ptxdist-bounces@pengutronix.de
Errors-To: ptxdist-bounces@pengutronix.de
To: ptxdist@pengutronix.de

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 <bernhard@bwalle.de>
> ---
> 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
> 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