[git.ipfire.org] IPFire 2.x development tree branch, next, updated. e967320c35488b13cf6dd77b0745fc8c6f083d68

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. e967320c35488b13cf6dd77b0745fc8c6f083d68

[git]

[-- Attachment #1: Type: text/plain, Size: 3330 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  e967320c35488b13cf6dd77b0745fc8c6f083d68 (commit)
      from  3bdc0102722bdbccd4429f0b38c4fb6a21f3f1c8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e967320c35488b13cf6dd77b0745fc8c6f083d68
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Fri Aug 10 14:28:33 2012 +0200

    icecc: Update to 0.9.7.
    
    Add patch for ARM support.

-----------------------------------------------------------------------

Summary of changes:
 lfs/icecc                                     |    7 ++++---
 src/patches/icecream-0.9.7-platform-arm.patch |   22 ++++++++++++++++++++++
 2 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 src/patches/icecream-0.9.7-platform-arm.patch

Difference in files:
diff --git a/lfs/icecc b/lfs/icecc
index d661b19..9c9651c 100644
--- a/lfs/icecc
+++ b/lfs/icecc
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.9.6
+VER        = 0.9.7
 
 THISAPP    = icecc-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = icecc
-PAK_VER    = 2
+PAK_VER    = 3
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = c6dacb3f28eade45f603a99245cde4fd
+$(DL_FILE)_MD5 = c06900c2f4011428d0d48826a04f74fb
 
 install : $(TARGET)
 
@@ -78,6 +78,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/icecream-rename-scheduler.patch
+	cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/icecream-0.9.7-platform-arm.patch
 	cd $(DIR_APP) && ./configure \
 				--prefix=/opt/icecream
 	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
diff --git a/src/patches/icecream-0.9.7-platform-arm.patch b/src/patches/icecream-0.9.7-platform-arm.patch
new file mode 100644
index 0000000..53402f0
--- /dev/null
+++ b/src/patches/icecream-0.9.7-platform-arm.patch
@@ -0,0 +1,22 @@
+Index: services/scheduler.cpp
+===================================================================
+--- services/scheduler.cpp	(revision 1310078)
++++ services/scheduler.cpp	(working copy)
+@@ -52,7 +52,7 @@
+ #include "config.h"
+ #include "bench.h"
+ 
+-#define DEBUG_SCHEDULER 0
++#define DEBUG_SCHEDULER 1
+ 
+ /* TODO:
+    * leak check
+@@ -613,6 +613,8 @@
+ 
+       platform_map.insert( make_pair( string( "ppc" ), string( "ppc64" ) ) );
+       platform_map.insert( make_pair( string( "s390" ), string( "s390x" ) ) );
++
++      platform_map.insert( make_pair( string( "armv5tel"), string( "armv7l" ) ) );
+     }
+ 
+   multimap<string, string>::const_iterator end = platform_map.upper_bound( target );


hooks/post-receive
--
IPFire 2.x development tree