From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from smtprelay04.ispgateway.de ([80.67.31.38]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1RnwsY-0007P6-Ng for ptxdist@pengutronix.de; Thu, 19 Jan 2012 19:38:31 +0100 Received: from [88.217.119.226] (helo=galilei.fritz.box) by smtprelay04.ispgateway.de with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.68) (envelope-from ) id 1RnwsY-0005AB-9r for ptxdist@pengutronix.de; Thu, 19 Jan 2012 19:38:30 +0100 From: Bernhard Walle Date: Thu, 19 Jan 2012 19:38:33 +0100 Message-Id: <1326998313-89494-1-git-send-email-bernhard@bwalle.de> Subject: [ptxdist] [PATCH v2] zlib: Fix build on non-Linux hosts Reply-To: ptxdist@pengutronix.de List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 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 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 --- 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