mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH v2] zlib: Fix build on non-Linux hosts
@ 2012-01-19 18:38 Bernhard Walle
  0 siblings, 0 replies; only message in thread
From: Bernhard Walle @ 2012-01-19 18:38 UTC (permalink / raw)
  To: ptxdist

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

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2012-01-19 18:38 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-01-19 18:38 [ptxdist] [PATCH v2] zlib: Fix build on non-Linux hosts Bernhard Walle

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox