Merge remote-tracking branch 'origin/next' into thirteen

[ipfire-2.x.git] / lfs / bash

diff --git a/lfs/bash b/lfs/bash
index c4fc567ae925210cfe5cdc127348fc5999d1cee8..c89ff545a99b6e1a6952f219b19abd8ffecbe4d6 100644 (file)
--- a/lfs/bash
+++ b/lfs/bash
@@ -48,6 +48,8 @@ else
   EXTRA_INSTALL = 
 endif
 
+EXTRA_CONFIG += ac_cv_func_working_mktime=yes
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -91,6 +93,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/bash/bash32-$$(printf "%03d" "$${i}") || exit 1; \
        done
 
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/bash-4.0-paths-1.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/bash-4.0-profile-1.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/bash-3.2-ssh_source_bash.patch
        cd $(DIR_APP) && ./configure $(EXTRA_CONFIG)
        cd $(DIR_APP) && make $(EXTRA_MAKE)
        cd $(DIR_APP) && make $(EXTRA_INSTALL) install