Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x into glibc-locale-fix

Conflicts:
	pkgs/core/ccache/ccache.nm

diff --cc pkgs/core/ccache/ccache.nm
index 3614e48654e78731504d1cc199b484d4d7c9b86a,63a30b8129aa16300f2739c919880ab39e734d04..3e9c455011a96363274b5a1464ee602657f8c676
--- 1/pkgs/core/ccache/ccache.nm
--- 2/pkgs/core/ccache/ccache.nm
+++ b/pkgs/core/ccache/ccache.nm
@@@ -43,10 -45,15 +45,14 @@@ ende
  
  PKG_TARBALL    = $(THISAPP).tar.gz
  
 -CONFIGURE_OPTIONS += --mandir=/usr/share
 +CONFIGURE_OPTIONS += \
 +      --mandir=/usr/share
  
 -define STAGE_INSTALL
 -      cd $(DIR_APP) && make install DESTDIR=$(BUILDROOT)
 -
+ define STAGE_PREPARE_CMDS
+       cd $(DIR_APP) && sed -e "s/hash_int(&hash, st.st_mtime);//g" -i ccache.c
+ endef
+ 
 +define STAGE_INSTALL_CMDS
        mkdir -pv $(BUILDROOT)/usr/ccache/bin
        for i in gcc g++ cc c++; do \
                ln -svf ../../bin/ccache $(BUILDROOT)/usr/ccache/bin/$${i}; \