From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from smtprelay06.ispgateway.de ([80.67.31.104]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1Rox1B-0002R8-Oe for ptxdist@pengutronix.de; Sun, 22 Jan 2012 13:59:35 +0100 Received: from [88.217.113.105] (helo=galilei.fritz.box) by smtprelay06.ispgateway.de with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.68) (envelope-from ) id 1Rox1B-0005fU-8s for ptxdist@pengutronix.de; Sun, 22 Jan 2012 13:59:33 +0100 From: Bernhard Walle Date: Sun, 22 Jan 2012 13:59:30 +0100 Message-Id: <1327237170-33859-1-git-send-email-bernhard@bwalle.de> In-Reply-To: <20120122104930.GD12400@pengutronix.de> References: <20120122104930.GD12400@pengutronix.de> Subject: [ptxdist] [PATCH] sitecopy: 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 sitecopy uses 'uname' to determine the operating system for which it compiles sitecopy. However, on non-Linux hosts, this leads to wrong results. Fixes Darwin (tested on Mac OS 10.7 Lion). Signed-off-by: Bernhard Walle --- v3: Same as v1 but with SITECOPY_CONF_ENV instead of SITECOPY_AUTOCONF and with comment. rules/sitecopy.make | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/rules/sitecopy.make b/rules/sitecopy.make index 44a7b8a..4434fe9 100644 --- a/rules/sitecopy.make +++ b/rules/sitecopy.make @@ -42,6 +42,14 @@ SITECOPY_AUTOCONF := $(CROSS_AUTOCONF_USR) \ --without-socks \ --without-gssapi +# m4/neon/neon.m4 uses uname to check for Darwin and adds some special compiler +# options in that case. sitecopy doesn't build host tools, so anything built +# is for the target. We can force the target operating system to Linux. That's simpler +# than fixing the m4/neon/neon.m4 and doesn't need autoreconf to run. +SITECOPY_CONF_ENV := \ + $(CROSS_ENV) \ + ne_cv_os_uname=Linux + ifdef PTXCONF_SITECOPY_SFTP SITECOPY_AUTOCONF += --enable-sftp else -- 1.7.7.4 -- ptxdist mailing list ptxdist@pengutronix.de