From 5082e476d1af0c1f5977a138146c9634f0b2f994 Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Sun, 17 Jan 2010 23:40:54 +0100 Subject: [PATCH] bash: fix configuration Patch bash32-011 modifies the configure.in script. Therefor we need to run autoconf before launching the configure script. Otherwise, once the configure script called, the makefile's dependencies over configure.in will relaunch autoconf without options/environnement variables we usually set when calling configure. [Peter: use our own host-autoconf instead of what's on the host] Signed-off-by: Lionel Landwerlin Signed-off-by: Peter Korsgaard --- package/bash/bash.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/bash/bash.mk b/package/bash/bash.mk index 705ce8d136..b7fc716873 100644 --- a/package/bash/bash.mk +++ b/package/bash/bash.mk @@ -32,6 +32,7 @@ $(BASH_DIR)/.unpacked: $(DL_DIR)/$(BASH_SOURCE) $(BASH_DIR)/.configured: $(BASH_DIR)/.unpacked # bash_cv_have_mbstate_t=yes (cd $(BASH_DIR); rm -rf config.cache; \ + $(AUTOCONF) && \ $(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_ARGS) \ CCFLAGS_FOR_BUILD="$(HOST_CFLAGS)" \ @@ -92,9 +93,9 @@ endif # If both bash and busybox are selected, make certain bash wins # the fight over who gets to own the /bin/sh symlink. ifeq ($(BR2_PACKAGE_BUSYBOX),y) -bash: ncurses busybox $(TARGET_DIR)/$(BASH_TARGET_BINARY) +bash: ncurses busybox host-autoconf $(TARGET_DIR)/$(BASH_TARGET_BINARY) else -bash: ncurses $(TARGET_DIR)/$(BASH_TARGET_BINARY) +bash: ncurses host-autoconf $(TARGET_DIR)/$(BASH_TARGET_BINARY) endif # If both bash and busybox are selected, the /bin/sh symlink