- install some more stuff that goes into staging_dir into the proper place.

First hunk of fixes for bug #1290

package/m4/m4.mk

@@ -3,7 +3,7 @@
 # m4
 #
 #############################################################
-M4_VER:=1.4.8
+M4_VER:=1.4.9
 M4_SOURCE:=m4-$(M4_VER).tar.bz2
 M4_CAT:=$(BZCAT)
 M4_SITE:=http://ftp.gnu.org/pub/gnu/m4
@@ -11,6 +11,10 @@ M4_DIR:=$(BUILD_DIR)/m4-$(M4_VER)
 M4_BINARY:=m4
 M4_TARGET_BINARY:=usr/bin/m4
 
+ifeq ($(UCLIBC_HAS_REGEX),y)
+gl_cv_func_re_compile_pattern_working=gl_cv_func_re_compile_pattern_working=yes
+endif
+
 $(DL_DIR)/$(M4_SOURCE):
 	 $(WGET) -P $(DL_DIR) $(M4_SITE)/$(M4_SOURCE)
 
@@ -18,6 +22,8 @@ m4-source: $(DL_DIR)/$(M4_SOURCE)
 
 $(M4_DIR)/.unpacked: $(DL_DIR)/$(M4_SOURCE)
 	$(M4_CAT) $(DL_DIR)/$(M4_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+	toolchain/patch-kernel.sh $(M4_DIR) package/m4 m4\*.patch
+	$(CONFIG_UPDATE) $(@D)
 	touch $(M4_DIR)/.unpacked
 
 $(M4_DIR)/.configured: $(M4_DIR)/.unpacked
@@ -25,12 +31,15 @@ $(M4_DIR)/.configured: $(M4_DIR)/.unpacked
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS)" \
 		LDFLAGS="$(TARGET_LDFLAGS)" \
+		gl_cv_func_gettimeofday_clobber=no \
+		$(gl_cv_func_re_compile_pattern_working) \
 		./configure \
 		--target=$(GNU_TARGET_NAME) \
 		--host=$(GNU_TARGET_NAME) \
 		--build=$(GNU_HOST_NAME) \
 		--prefix=/usr \
 		--exec-prefix=/usr \
+		$(DISABLE_LARGEFILE) \
 	);
 	touch $(M4_DIR)/.configured