Merge pull request #8 from trygvis/master

Fix elftosb build.

2 files changed, 53 insertions, 4 deletions

diff --git a/meta-fsl-arm/recipes-bsp/elftosb/elftosb_10.12.01.bb b/meta-fsl-arm/recipes-bsp/elftosb/elftosb_10.12.01.bb
index 17f34ad2b..08cca38de 100644
--- a/meta-fsl-arm/recipes-bsp/elftosb/elftosb_10.12.01.bb
+++ b/meta-fsl-arm/recipes-bsp/elftosb/elftosb_10.12.01.bb
@@ -5,15 +5,14 @@ DESCRIPTION = "Helper utility for freescale imx platforms"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=172ede34353056ebec7a597d8459f029"
 SECTION = "bootloader"
-PR = "r1"
+PR = "r2"
 BBCLASSEXTEND = "native"
 
-SRC_URI = "http://repository.timesys.com/buildsources/e/elftosb/elftosb-${PV}/elftosb-${PV}.tar.gz"
+SRC_URI = "http://repository.timesys.com/buildsources/e/elftosb/elftosb-${PV}/elftosb-${PV}.tar.gz \
+           file://cross-build.patch"
 SRC_URI[md5sum] = "e8005d606c1e0bb3507c82f6eceb3056"
 SRC_URI[sha256sum] = "77bb6981620f7575b87d136d94c7daa88dd09195959cc75fc18b138369ecd42b"
 
-EXTRA_OEMAKE += "LIBS='-lstdc++ -lm'"
-
 do_install() {
     install -d ${D}${bindir}
     install ${S}/bld/linux/elftosb ${D}${bindir}
diff --git a/meta-fsl-arm/recipes-bsp/elftosb/files/cross-build.patch b/meta-fsl-arm/recipes-bsp/elftosb/files/cross-build.patch
new file mode 100644
index 000000000..8cffa03e0
--- /dev/null
+++ b/meta-fsl-arm/recipes-bsp/elftosb/files/cross-build.patch
@@ -0,0 +1,50 @@
+--- a/makefile.rules.orig       2012-05-09 21:03:28.000000000 +0200
++++ b/makefile.rules    2012-05-09 21:03:56.000000000 +0200
+@@ -9,6 +9,8 @@
+ #   SRC_DIR needs to be passed in.  It is assumed that make is running in
+ #   the build directory.
+ 
++CC ?= gcc
++
+ #*******************************************************************************
+ #                               Environment
+ 
+@@ -101,7 +103,7 @@
+        keygen.o
+ 
+ 
+-LIBS =     -lstdc++
++LIBS ?=     -lstdc++ -lm
+ 
+ 
+ ifeq ("${UNAMES}", "Linux")
+@@ -137,13 +139,13 @@
+                ${EXEC_FILE_ELFTOSB2} ${EXEC_FILE_SBTOOL} ${EXEC_FILE_KEYGEN}
+ 
+ elftosb: ${OBJ_FILES_ELFTOSB2}
+-       gcc ${OBJ_FILES_ELFTOSB2} ${LIBS} -o ${EXEC_FILE_ELFTOSB2}
++       ${CC} ${OBJ_FILES_ELFTOSB2} ${LIBS} -o ${EXEC_FILE_ELFTOSB2}
+ 
+ sbtool: ${OBJ_FILES_SBTOOL}
+-       gcc ${OBJ_FILES_SBTOOL} ${LIBS} -o ${EXEC_FILE_SBTOOL}
++       ${CC} ${OBJ_FILES_SBTOOL} ${LIBS} -o ${EXEC_FILE_SBTOOL}
+ 
+ keygen: ${OBJ_FILES_KEYGEN}
+-       gcc ${OBJ_FILES_KEYGEN} ${LIBS} -o ${EXEC_FILE_KEYGEN}
++       ${CC} ${OBJ_FILES_KEYGEN} ${LIBS} -o ${EXEC_FILE_KEYGEN}
+ 
+ 
+ #ifeq ("${UNAMES}", "Linux")
+@@ -153,10 +155,10 @@
+ .SUFFIXES : .c .cpp
+ 
+ .c.o :
+-       gcc ${CFLAGS} -c $<
++       ${CC} ${CFLAGS} -c $<
+ 
+ .cpp.o :
+-       gcc ${CFLAGS} -c $<
++       ${CC} ${CFLAGS} -c $<
+ 
+ #endif
+