From: Schantl Stefan <Stevee@ipfire.org>
Date: Fri, 19 Mar 2010 14:26:42 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x into glibc-locale-fix
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cee45e8438e3734933abc58d31bb63c5dd0db00f;p=ipfire-3.x.git

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

Conflicts:
	pkgs/core/ccache/ccache.nm
---

cee45e8438e3734933abc58d31bb63c5dd0db00f
diff --cc pkgs/core/ccache/ccache.nm
index 3614e4865,63a30b812..3e9c45501
--- a/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_PREPARE_CMDS
+ 	cd $(DIR_APP) && sed -e "s/hash_int(&hash, st.st_mtime);//g" -i ccache.c
+ endef
+ 
 -define STAGE_INSTALL
 -	cd $(DIR_APP) && make install DESTDIR=$(BUILDROOT)
 -
 +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}; \