mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Bernhard Walle <bernhard@bwalle.de>
To: ptxdist@pengutronix.de
Subject: [ptxdist] [PATCH v2] zlib: Fix build on non-Linux hosts
Date: Thu, 19 Jan 2012 19:38:33 +0100	[thread overview]
Message-ID: <1326998313-89494-1-git-send-email-bernhard@bwalle.de> (raw)

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>
---
v2: After reworking the sitecopy fix, I checked if it makes sense to
    use the same fix for zlib. However, zlib isn't using autoconf, it just
    uses a hand-written configure script. But now I think the "--uname"
    option which is explicitly provided is more clean than just setting
    some environment variable which indeed is an implementation detail of
    the script.

 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.7.4


-- 
ptxdist mailing list
ptxdist@pengutronix.de

                 reply	other threads:[~2012-01-19 18:38 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=1326998313-89494-1-git-send-email-bernhard@bwalle.de \
    --to=bernhard@bwalle.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