summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBernhard Walle <bernhard@bwalle.de>2012-01-22 13:59:30 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2012-01-23 23:16:08 +0100
commiteb059ac1e009a45f96eb530a42e360dcb37eb1ba (patch)
tree431f0bb943b96b437e4a3d6758f0975bb90b6e2d
parent2279d29265920de12707d18ab71e0d9e7fe70414 (diff)
downloadptxdist-eb059ac1e009a45f96eb530a42e360dcb37eb1ba.tar.gz
ptxdist-eb059ac1e009a45f96eb530a42e360dcb37eb1ba.tar.xz
sitecopy: Fix build on non-Linux hosts
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 <bernhard@bwalle.de> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--rules/sitecopy.make8
1 files changed, 8 insertions, 0 deletions
diff --git a/rules/sitecopy.make b/rules/sitecopy.make
index 44a7b8ae9..4434fe991 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