From 4833bf481dc296476d93accf2cf3192385735acb Mon Sep 17 00:00:00 2001 From: Christian Wiese Date: Wed, 14 Jul 2010 13:03:27 +0200 Subject: [PATCH] bash: fixed to avoid bash's built-in getcwd at cross stage, causing conflicts with the implementation of getcwd we use in our fl_wrapper see: http://dev.opensde.net/issues/show/9 --- shells/bash/bash.conf | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/shells/bash/bash.conf b/shells/bash/bash.conf index 0134eeba0..28c3ef127 100644 --- a/shells/bash/bash.conf +++ b/shells/bash/bash.conf @@ -2,6 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../bash/bash.conf +# Copyright (C) 2010 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf # @@ -44,6 +45,13 @@ pkg_bash_preconf() { pkg_bash_docver=$ver +# avoid to use bash's built-in getcwd because it conflicts with +# the implementation of our fl_wrapper +# see: http://dev.opensde.net/issues/show/9 +if atstage cross; then + var_append configcache ' ' 'bash_cv_getcwd_malloc=yes' +fi + var_append confopt " " "--without-bash-malloc" [ "$SDECFG_PKG_BASH_PROGCOMP" = 0 ] &&