On Mon, Jan 16, 2012 at 09:27:22PM +0100, Bernhard Walle wrote:
> 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), doesn't break Linux (verified with
> current Arch Linux on x86_64).

In this case I actually prefer this over the patch. The cached variable is
rather straightforward. Most importantly upstream seems to be dead (no
release in over 3 years). This means we'll have to keep the patch forever,
and I'd like to keep such patches at a minimum.

Michael

> Signed-off-by: Bernhard Walle <[email protected]>
> ---
>  rules/sitecopy.make |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/rules/sitecopy.make b/rules/sitecopy.make
> index 44a7b8a..c5af415 100644
> --- a/rules/sitecopy.make
> +++ b/rules/sitecopy.make
> @@ -40,7 +40,8 @@ SITECOPY_AUTOCONF := $(CROSS_AUTOCONF_USR) \
>       --disable-rpath \
>       --without-pakchois \
>       --without-socks \
> -     --without-gssapi
> +     --without-gssapi \
> +     ne_cv_os_uname=Linux

It's a variable, so it should be defined in SITECOPY_CONF_ENV. See e.g.
rules/libpv.make as an example. And add a comment why it's needed.

Michael

>  
>  ifdef PTXCONF_SITECOPY_SFTP
>  SITECOPY_AUTOCONF += --enable-sftp
> -- 
> 1.7.7.4
> 
> 
> -- 
> ptxdist mailing list
> [email protected]
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
[email protected]

Reply via email to