[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-369-g0d65f75

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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 "armadeus".

The branch, master has been updated
       via  0d65f75f65ee4f404c5579f1422d09eb77b1bfae (commit)
      from  59d31f68eb5b90507f8e67a62e134cbf6506c996 (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 0d65f75f65ee4f404c5579f1422d09eb77b1bfae
Author: Samuel Martin <s.m...@gm...>
Date:   Tue Jun 12 20:49:11 2012 +0200

    fix 165-Add-Freescale-elftosb-host-package.patch
    
    Add elftosb10.12.01-force_cxx_compiler.patch, that force to build
    elftosb using C++ compiler.
    
    Signed-off-by: Samuel Martin <s.m...@gm...>

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

Summary of changes:
 .../165-Add-Freescale-elftosb-host-package.patch   |   92 ++++++++++++++++++-
 1 files changed, 87 insertions(+), 5 deletions(-)

diff --git a/patches/buildroot/2012.02/165-Add-Freescale-elftosb-host-package.patch b/patches/buildroot/2012.02/165-Add-Freescale-elftosb-host-package.patch
index 8fe5346..4f76ab3 100644
--- a/patches/buildroot/2012.02/165-Add-Freescale-elftosb-host-package.patch
+++ b/patches/buildroot/2012.02/165-Add-Freescale-elftosb-host-package.patch
@@ -8,8 +8,9 @@ to be used with CPUs imx23, imx28, stp37xx
 
 Signed-off-by: Eric Jarrige <eri...@ar...>
 ---
- package/elftosb/elftosb.mk                         |   28 ++++++++++++++++++++
+ package/elftosb/elftosb.mk                         |   27 ++++++++++++++++++++
  .../elftosb/elftosb10.12.01-fixes_includes.patch   |   19 +++++++++++++
+ .../0001-host-elftosb-force-c++-compiler.patch     |   79 +++++++++++++++++++++
  2 files changed, 47 insertions(+), 0 deletions(-)
  create mode 100644 package/elftosb/elftosb.mk
  create mode 100644 package/elftosb/elftosb10.12.01-fixes_includes.patch
@@ -19,7 +20,7 @@ new file mode 100644
 index 0000000..75b95a5
 --- /dev/null
 +++ b/package/elftosb/elftosb.mk
-@@ -0,0 +1,28 @@
+@@ -0,0 +1,27 @@
 +#############################################################
 +#
 +# elftosb
@@ -30,7 +31,7 @@ index 0000000..75b95a5
 +ELFTOSB_SITE = http://repository.timesys.com/buildsources/e/elftosb/elftosb-$(ELFTOSB_VERSION)
 +
 +define HOST_ELFTOSB_BUILD_CMDS
-+	$(HOST_MAKE_ENV) $(MAKE) -C $(@D) all
++	$(HOST_MAKE_ENV) $(MAKE) CXX="$(HOSTCXX)" -C $(@D) all
 +endef
 +
 +define HOST_ELFTOSB_INSTALL_CMDS
@@ -47,7 +48,6 @@ index 0000000..75b95a5
 +endef
 +
 +$(eval $(call GENTARGETS,host))
-+
 diff --git a/package/elftosb/elftosb10.12.01-fixes_includes.patch b/package/elftosb/elftosb10.12.01-fixes_includes.patch
 new file mode 100644
 index 0000000..eaf8eba
@@ -73,6 +73,88 @@ index 0000000..eaf8eba
 + #include <stdint.h>
 + //typedef unsigned long uint32_t;
 + //typedef unsigned short uint16_t;
--- 
+--- /dev/null
++++ b/package/elftosb/elftosb10.12.01-force_cxx_compiler.patch
+@@ -0,0 +1,79 @@
++Subject: [PATCH 1/1] elftosb: force host C++ compiler
++
++Because Freescale provides *.cpp sources and elftosb links again libstdc++,
++force to use the host c++ compiler.
++
++Signed-off-by: Samuel Martin <s.m...@gm...>
++
++---
++Index: host-elftosb-10.12.01/makefile.rules
++===================================================================
++--- host-elftosb-10.12.01.orig/makefile.rules	2012-06-09 21:12:23.557526100 +0200
+++++ host-elftosb-10.12.01/makefile.rules	2012-06-09 21:15:21.659894571 +0200
++@@ -15,6 +15,8 @@
++ # UNAMES is going to be set to either "Linux" or "CYGWIN_NT-5.1"
++ UNAMES = $(shell uname -s)
++
+++CXX ?= g++
+++
++ #*******************************************************************************
++ #                               Directories
++
++@@ -37,9 +39,9 @@
++ #*******************************************************************************
++ #                               Build flags
++-# gcc Compiler flags
+++# Compiler flags
++ #    -g						: Produce debugging information.
++
++-CFLAGS	    = -g $(INC_PATH) -D${UNAMES}
+++CXXFLAGS	= -g $(INC_PATH) -D${UNAMES}
++
++ #*******************************************************************************
++ #                               File lists
++@@ -137,13 +139,13 @@ clean:
++ 		${EXEC_FILE_ELFTOSB2} ${EXEC_FILE_SBTOOL} ${EXEC_FILE_KEYGEN}
++
++ elftosb: ${OBJ_FILES_ELFTOSB2}
++-	gcc ${OBJ_FILES_ELFTOSB2} ${LIBS} -o ${EXEC_FILE_ELFTOSB2}
+++	$(CXX) ${OBJ_FILES_ELFTOSB2} ${LIBS} -o ${EXEC_FILE_ELFTOSB2}
++
++ sbtool: ${OBJ_FILES_SBTOOL}
++-	gcc ${OBJ_FILES_SBTOOL} ${LIBS} -o ${EXEC_FILE_SBTOOL}
+++	$(CXX) ${OBJ_FILES_SBTOOL} ${LIBS} -o ${EXEC_FILE_SBTOOL}
++
++ keygen: ${OBJ_FILES_KEYGEN}
++-	gcc ${OBJ_FILES_KEYGEN} ${LIBS} -o ${EXEC_FILE_KEYGEN}
+++	$(CXX) ${OBJ_FILES_KEYGEN} ${LIBS} -o ${EXEC_FILE_KEYGEN}
++
++
++ #ifeq ("${UNAMES}", "Linux")
++@@ -153,10 +155,10 @@ keygen: ${OBJ_FILES_KEYGEN}
++ .SUFFIXES : .c .cpp
++
++ .c.o :
++-	gcc ${CFLAGS} -c $<
+++	$(CXX) ${CXXFLAGS} -c $<
++
++ .cpp.o :
++-	gcc ${CFLAGS} -c $<
+++	$(CXX) ${CXXFLAGS} -c $<
++
++ #endif
++
++@@ -165,13 +167,13 @@ keygen: ${OBJ_FILES_KEYGEN}
++
++ %.d: %.c
++ 	@set -e; \
++-	$(CC) -MM $(CFLAGS) $< | \
+++	$(CXX) -MM $(CXXFLAGS) $< | \
++ 	sed 's/\($*\)\.o[ :]*/\1.o $@ : /g' > $@; \
++ 	[ -s $@ ]  || rm -f $@
++
++ %.d: %.cpp
++ 	@set -e; \
++-	$(CC) -MM $(CFLAGS) $< | \
+++	$(CXX) -MM $(CXXFLAGS) $< | \
++ 	sed 's/\($*\)\.o[ :]*/\1.o $@ : /g' > $@; \
++ 	[ -s $@ ]  || rm -f $@
++
+--
 1.7.2.5
 


hooks/post-receive
-- 
armadeus


