* bash.make, bash.in:

	version bump to 3.2.48
	marked static linking as broken


git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@9441 33e552b5-05e3-0310-8538-816dae2090ed

2 files changed, 100 insertions, 109 deletions

diff --git a/rules/bash.in b/rules/bash.in
index a841de9ef..66c8df7d3 100644
--- a/rules/bash.in
+++ b/rules/bash.in
@@ -25,9 +25,15 @@ config BASH_SHLIKE
 	  This produces a shell with minimal features, close to the
 	  historical Bourne shell.
 
+comment ""
+	depends on INVISIBLE
+
+if !BASH_SHLIKE
+
 config BASH_ALIASES
 	bool
 	prompt "Enable aliases"
+	default y
 	help
 	  Aliases allow a string to be substituted for a word
 	  when it is used as the first word of a simple command.
@@ -43,10 +49,12 @@ config BASH_ALIASES
 config BASH_ARRAY
 	bool
 	prompt "Include shell array variables"
+	default y
 
 config BASH_HISTORY
 	bool
 	prompt "Turn on csh-style history substitution"
+	default y
 	help
 	  The bash shell supports a history expansion feature
 	  that is similar to the history expansion in csh.
@@ -54,21 +62,23 @@ config BASH_HISTORY
 config BASH_BRACE
 	bool
 	prompt "Include brace expansion"
+	default y
 	help
 	  Brace  expansion is a mechanism by which arbitrary
 	  strings may be generated.  This mechanism is similar
 	  to pathname expansion, but the filenames generated
 	  need not exist.
 
-#config BASH_CONDITIONAL
-#	bool
-#	prompt "Enable the conditional command"
-#	depends on BASH
-#	help "This does currently (bash-2.05b) not work properly and is deactivated in bash.make!"
+config BASH_CONDITIONAL
+	bool
+	default y
+	prompt "Enable the conditional command"
+	depends on BASH
 
 config BASH_DIRSTACK
 	bool
 	prompt "Enable builtins pushd/popd/dirs"
+	default y
 	help
 	   Without  options, "dirs" displays the list of
 	   currently remembered directories.  The default
@@ -77,11 +87,11 @@ config BASH_DIRSTACK
 	   added to the list with the pushd command;
 	   the popd command removes entries from the list.
 
-#config BASH_EXTPATTERN
-#	bool
-#	prompt "Include ksh-style extended pattern matching"
-#	depends on BASH
-#	help "This does currently (bash-2.05b) not work properly and is deactivated in bash.make!"
+config BASH_EXTPATTERN
+	bool
+#	default y
+	prompt "Include ksh-style extended pattern matching"
+	depends on BASH
 
 config BASH_HELP
 	bool
@@ -92,6 +102,7 @@ config BASH_HELP
 config BASH_CMDHISTORY
 	bool
 	prompt "Turn on command history"
+	default y
 	help
 	  This enables command history features. The shell
 	  buffers commands in a ringbuffer, which can be listed,
@@ -101,6 +112,7 @@ config BASH_CMDHISTORY
 config BASH_JOBS
 	bool
 	prompt "Enable job control features"
+	default y
 	help
 	  This enables support for background jobs in bash.
 	  You can list the actual managed jobs by the "jobs" command.
@@ -108,6 +120,7 @@ config BASH_JOBS
 config BASH_LARGEFILES
 	bool
 	prompt "Enable support for large files"
+	default y
 	help
 	  Enable support for large files (LFS) if the operating system
 	  requires special compiler options to build programs
@@ -116,6 +129,7 @@ config BASH_LARGEFILES
 config BASH_PROCSUBST
 	bool
 	prompt "Enable process substitution"
+	default y
 	help
 	  This enables process substitution if the operating system
 	  provides the necessary support.
@@ -137,13 +151,15 @@ config BASH_COMPLETION
 config BASH_ESC
 	bool
 	prompt "Turn on escape character decoding in prompts"
+	default y
 	help
 	  Turn on the interpretation of a number of backslash-escaped
 	  characters in the $PS1, $PS2, $PS3, and $PS4 prompt strings.
 
 config BASH_EDIT
 	bool
-	prompt "Turn on command line editing"
+#	prompt "Turn on command line editing"
+	default y
 	help
 	  Include support for command-line editing and history with
 	  the Bash version of the Readline library.
@@ -165,9 +181,12 @@ config BASH_SELECT
 	  Include the select builtin, which allows the generation of
 	  simple menus.
 
+endif
+
 config BASH_GPROF
 	bool
 	prompt "Allow profiling with gprof"
+	depends on BROKEN
 	help
 	  This builds a Bash binary that produces profiling information
 	  to be processed by gprof each time it is executed.
@@ -175,6 +194,7 @@ config BASH_GPROF
 config BASH_STATIC
 	bool
 	prompt "Link bash statically"
+	depends on BROKEN
 	help
 	  This causes Bash to be linked statically, if gcc is being used.
 	  This could be used to build a version to use as root's shell.
diff --git a/rules/bash.make b/rules/bash.make
index 78973cab7..195164bd0 100644
--- a/rules/bash.make
+++ b/rules/bash.make
@@ -1,7 +1,7 @@
 # -*-makefile-*-
 # $Id$
 #
-# Copyright (C) 2003 by Pengutronix e.K., Hildesheim, Germany
+# Copyright (C) 2003-2009 by Pengutronix e.K., Hildesheim, Germany
 # See CREDITS for details about who has contributed to this project.
 #
 # For further information about the PTXdist project and license conditions
@@ -16,144 +16,127 @@ PACKAGES-$(PTXCONF_BASH) += bash
 #
 # Paths and names
 #
-BASH_VERSION		= 3.2
-BASH			= bash-$(BASH_VERSION)
-BASH_URL		= $(PTXCONF_SETUP_GNUMIRROR)/bash/$(BASH).tar.gz
-BASH_SOURCE		= $(SRCDIR)/$(BASH).tar.gz
-BASH_DIR		= $(BUILDDIR)/$(BASH)
+BASH_VERSION	:= 3.2.48
+BASH		:= bash-$(BASH_VERSION)
+BASH_SUFFIX	:= tar.gz
+BASH_URL	:= $(PTXCONF_SETUP_GNUMIRROR)/bash/$(BASH).$(BASH_SUFFIX)
+BASH_SOURCE	:= $(SRCDIR)/$(BASH).$(BASH_SUFFIX)
+BASH_DIR	:= $(BUILDDIR)/$(BASH)
 
 
 # ----------------------------------------------------------------------------
 # Get
 # ----------------------------------------------------------------------------
 
-bash_get: $(STATEDIR)/bash.get
-
-$(STATEDIR)/bash.get: $(bash_get_deps_default)
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
-
 $(BASH_SOURCE):
-	@$(call targetinfo, $@)
+	@$(call targetinfo)
 	@$(call get, BASH)
 
 # ----------------------------------------------------------------------------
-# Extract
-# ----------------------------------------------------------------------------
-
-bash_extract: $(STATEDIR)/bash.extract
-
-$(STATEDIR)/bash.extract: $(bash_extract_deps_default)
-	@$(call targetinfo, $@)
-	@$(call clean $(BASH_DIR))
-	@$(call extract, BASH)
-	@$(call patchin, BASH)
-	@$(call touch, $@)
-
-# ----------------------------------------------------------------------------
 # Prepare
 # ----------------------------------------------------------------------------
 
-bash_prepare: $(STATEDIR)/bash.prepare
+BASH_PATH	:= PATH=$(CROSS_PATH)
+BASH_ENV	:= $(CROSS_ENV)
 
-BASH_AUTOCONF	= $(CROSS_AUTOCONF_ROOT) \
-	--disable-sanity-checks \
-	--datadir=/usr/share
-BASH_PATH	=  PATH=$(CROSS_PATH)
-BASH_ENV	=  $(CROSS_ENV) \
-	ac_cv_func_setvbuf_reversed=no \
-	bash_cv_have_mbstate_t=yes
 
-# FIXME: "disable" does not compile with bash-2.05b (at least not on ARM)
-BASH_AUTOCONF	+= --enable-dparen-arithmetic
+BASH_AUTOCONF	:= \
+	$(CROSS_AUTOCONF_ROOT) \
+	--without-bash-malloc \
+	--disable-net-redirections
 
-ifeq (y, $(PTXCONF_BASH_SHLIKE))
-# FIXME: "enable" does not compile with bash-2.05b (at least not on ARM)
-#BASH_AUTOCONF	+= --enable-minimal-config
-BASH_AUTOCONF	+= --disable-minimal-config
+ifdef PTXCONF_BASH_SHLIKE
+BASH_AUTOCONF	+= --enable-minimal-config
 else
 BASH_AUTOCONF	+= --disable-minimal-config
 endif
-ifeq (y, $(PTXCONF_BASH_ALIASES))
+
+ifdef PTXCONF_BASH_ALIASES
 BASH_AUTOCONF	+= --enable-alias
 else
-# FIXME: "disable" does not compile with bash-2.05b (at least not on ARM)
-#BASH_AUTOCONF	+= --disable-alias
-BASH_AUTOCONF	+= --enable-alias
+BASH_AUTOCONF	+= --disable-alias
 endif
-ifeq (y, $(PTXCONF_BASH_ARITHMETIC_FOR))
+
+ifdef PTXCONF_BASH_ARITHMETIC_FOR
 BASH_AUTOCONF	+= --enable-arith-for-command
 else
-# FIXME: "disable" does not compile with bash-2.05b (at least not on ARM)
-#BASH_AUTOCONF	+= --disable-arith-for-command
-BASH_AUTOCONF	+= --enable-arith-for-command
+BASH_AUTOCONF	+= --disable-arith-for-command
 endif
-ifeq (y, $(PTXCONF_BASH_ARRAY))
+
+ifdef PTXCONF_BASH_ARRAY
 BASH_AUTOCONF	+= --enable-array-variables
 else
 BASH_AUTOCONF	+= --disable-array-variables
 endif
-ifeq (y, $(PTXCONF_BASH_HISTORY))
+
+ifdef PTXCONF_BASH_HISTORY
 BASH_AUTOCONF	+= --enable-bang-history
 else
 BASH_AUTOCONF	+= --disable-bang-history
 endif
-ifeq (y, $(PTXCONF_BASH_BRACE))
+
+ifdef PTXCONF_BASH_BRACE
 BASH_AUTOCONF	+= --enable-brace-expansion
 else
 BASH_AUTOCONF	+= --disable-brace-expansion
 endif
-ifeq (y, $(PTXCONF_BASH_CONDITIONAL))
+
+ifdef PTXCONF_BASH_CONDITIONAL
 BASH_AUTOCONF	+= --enable-cond-command
 else
-# FIXME: "disable" does not compile with bash-2.05b (at least not on ARM)
-# BASH_AUTOCONF	+= --disable-cond-command
-BASH_AUTOCONF	+= --enable-cond-command
+BASH_AUTOCONF	+= --disable-cond-command
 endif
-ifeq (y, $(PTXCONF_BASH_DIRSTACK))
+
+ifdef PTXCONF_BASH_DIRSTACK
 BASH_AUTOCONF	+= --enable-directory-stack
 else
 BASH_AUTOCONF	+= --disable-directory-stack
 endif
-ifeq (y, $(PTXCONF_BASH_EXTPATTERN))
+
+ifdef PTXCONF_BASH_EXTPATTERN
 BASH_AUTOCONF	+= --enable-extended-glob
 else
-# FIXME: "disable" does not compile with bash-2.05b (at least not on ARM)
-#BASH_AUTOCONF	+= --disable-extended-glob
-BASH_AUTOCONF	+= --enable-extended-glob
+BASH_AUTOCONF	+= --disable-extended-glob
 endif
-ifeq (y, $(PTXCONF_BASH_HELP))
+
+ifdef PTXCONF_BASH_HELP
 BASH_AUTOCONF	+= --enable-help-builtin
 else
 BASH_AUTOCONF	+= --disable-help-builtin
 endif
-ifeq (y, $(PTXCONF_BASH_CMDHISTORY))
+
+ifdef PTXCONF_BASH_CMDHISTORY
 BASH_AUTOCONF	+= --enable-history
 else
 BASH_AUTOCONF	+= --disable-history
 endif
-ifeq (y, $(PTXCONF_BASH_JOBS))
+
+ifdef PTXCONF_BASH_JOBS
 BASH_ENV	+= bash_cv_job_control_missing=present
 BASH_AUTOCONF	+= --enable-job-control
 else
 BASH_AUTOCONF	+= --disable-job-control
 endif
-ifeq (y, $(PTXCONF_BASH_LARGEFILES))
+
+ifdef PTXCONF_BASH_LARGEFILES
 BASH_AUTOCONF	+= --enable-largefile
 else
 BASH_AUTOCONF	+= --disable-largefile
 endif
-ifeq (y, $(PTXCONF_BASH_PROCSUBST))
+
+ifdef PTXCONF_BASH_PROCSUBST
 BASH_AUTOCONF	+= --enable-process-substitution
 else
 BASH_AUTOCONF	+= --disable-process-substitution
 endif
-ifeq (y, $(PTXCONF_BASH_COMPLETION))
+
+ifdef PTXCONF_BASH_COMPLETION
 BASH_AUTOCONF	+= --enable-progcomp
 else
 BASH_AUTOCONF	+= --disable-progcomp
 endif
-ifeq (y, $(PTXCONF_BASH_ESC))
+
+ifdef PTXCONF_BASH_ESC
 BASH_AUTOCONF	+= --enable-prompt-string-decoding
 else
 BASH_AUTOCONF	+= --disable-prompt-string-decoding
@@ -161,71 +144,59 @@ endif
 
 # these options are currently untested...
 
-ifeq (y, $(PTXCONF_BASH_EDIT))
+ifdef PTXCONF_BASH_EDIT
 BASH_AUTOCONF	+= --enable-readline
 else
 BASH_AUTOCONF	+= --disable-readline
 endif
-ifeq (y, $(PTXCONF_BASH_RESTRICTED))
+
+ifdef PTXCONF_BASH_RESTRICTED
 BASH_AUTOCONF	+= --enable-restricted
 else
 BASH_AUTOCONF	+= --disable-restricted
 endif
-ifeq (y, $(PTXCONF_BASH_SELECT))
+
+ifdef PTXCONF_BASH_SELECT
 BASH_AUTOCONF	+= --enable-select
 else
 BASH_AUTOCONF	+= --disable-select
 endif
-ifeq (y, $(PTXCONF_BASH_GPROF))
+
+ifdef PTXCONF_BASH_GPROF
 BASH_AUTOCONF	+= --enable-profiling
 else
 BASH_AUTOCONF	+= --disable-profiling
 endif
-ifeq (y, $(PTXCONF_BASH_STATIC))
+
+ifdef PTXCONF_BASH_STATIC
 BASH_AUTOCONF	+= --enable-static-link
 else
 BASH_AUTOCONF	+= --disable-static-link
 endif
 
-# on Linux, we always want the glibc malloc
-BASH_AUTOCONF	+= --with-bash-malloc=no
-
-$(STATEDIR)/bash.prepare: $(bash_prepare_deps_default)
-	@$(call targetinfo, $@)
-	cd $(BASH_DIR) && \
-		$(BASH_PATH) $(BASH_ENV) \
-		./configure $(BASH_AUTOCONF)
-	@$(call touch, $@)
-
 # ----------------------------------------------------------------------------
 # Compile
 # ----------------------------------------------------------------------------
 
-bash_compile: $(STATEDIR)/bash.compile
-
-$(STATEDIR)/bash.compile: $(bash_compile_deps_default)
-	@$(call targetinfo, $@)
-	cd $(BASH_DIR) && $(BASH_PATH) $(MAKE) $(PARALLELMFLAGS_BROKEN)
-	@$(call touch, $@)
+$(STATEDIR)/bash.compile:
+	@$(call targetinfo)
+	cd $(BASH_DIR) && $(BASH_PATH) $(MAKE) $(PARALLELMFLAGS) #_BROKEN)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Install
 # ----------------------------------------------------------------------------
 
-bash_install: $(STATEDIR)/bash.install
-
-$(STATEDIR)/bash.install: $(bash_install_deps_default)
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
+$(STATEDIR)/bash.install:
+	@$(call targetinfo)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Target-Install
 # ----------------------------------------------------------------------------
 
-bash_targetinstall: $(STATEDIR)/bash.targetinstall
-
-$(STATEDIR)/bash.targetinstall: $(bash_targetinstall_deps_default)
-	@$(call targetinfo, $@)
+$(STATEDIR)/bash.targetinstall:
+	@$(call targetinfo)
 
 	@$(call install_init, bash)
 	@$(call install_fixup, bash,PACKAGE,bash)
@@ -241,7 +212,7 @@ $(STATEDIR)/bash.targetinstall: $(bash_targetinstall_deps_default)
 
 	@$(call install_finish, bash)
 
-	@$(call touch, $@)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Clean