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 <llandwerlin@gmail.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
parent
57e0f540ff
commit
5082e476d1
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user