mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Subject: Re: [ptxdist] [PATCH] zlib: Fix build on non-Linux hosts
Date: Mon, 6 Feb 2012 21:04:15 +0100	[thread overview]
Message-ID: <20120206200415.GD32645@pengutronix.de> (raw)
In-Reply-To: <1328432822-18280-1-git-send-email-bernhard@bwalle.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

  reply	other threads:[~2012-02-06 20:04 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-02-05  9:07 Bernhard Walle
2012-02-06 20:04 ` Michael Olbrich [this message]
  -- strict thread matches above, loose matches on Subject: below --
2012-01-15 20:28 Bernhard Walle

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20120206200415.GD32645@pengutronix.de \
    --to=m.olbrich@pengutronix.de \
    --cc=ptxdist@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox