elf2flt-nios2: This should build now. Seriously. Really Really.

Really Really Really.

Signed-off-by: Leon Woestenberg <leon@sidebranch.com>

4 files changed, 13 insertions, 8 deletions

diff --git a/recipes/binutils/binutils-cross.inc b/recipes/binutils/binutils-cross.inc
index 36920656ae..8aec6d7532 100644
--- a/recipes/binutils/binutils-cross.inc
+++ b/recipes/binutils/binutils-cross.inc
@@ -8,12 +8,13 @@ EXTRA_OECONF = "--with-sysroot=${STAGING_DIR_TARGET} \
 		--enable-install-libbfd \
                 --disable-werror"
 
+# --enable-install-libiberty"
+
 do_stage () {
 	oe_runmake install
+
 	install -d ${CROSS_DIR}/include
 	install -m 0644 ${S}/include/libiberty.h ${CROSS_DIR}/include
-#	install -d ${CROSS_DIR}/lib
-#	install -m 0644 ${S}/lib/libiberty.a ${CROSS_DIR}/lib
 
 	# We don't really need these, so we'll remove them...
 	rm -rf ${CROSS_DIR}/lib/ldscripts
@@ -29,5 +30,8 @@ do_stage () {
 }
 
 do_install () {
-	:
+  :
+# this already happens, don't know why
+#	install -d ${CROSS_DIR}/lib
+#	install -m 0644 ${S}/lib/libiberty.a ${CROSS_DIR}/lib
 }
diff --git a/recipes/binutils/binutils.inc b/recipes/binutils/binutils.inc
index 81b352866d..40da3fdcc8 100644
--- a/recipes/binutils/binutils.inc
+++ b/recipes/binutils/binutils.inc
@@ -113,7 +113,7 @@ do_install () {
 	install -m 644 ${S}/include/ansidecl.h ${D}${includedir}
 	install -m 644 ${S}/include/libiberty.h ${D}${includedir}
 
-    oe_libinstall -a -C libiberty libiberty 
+    #oe_libinstall -a -C libiberty libiberty 
 
 	cd ${D}${bindir}
 
diff --git a/recipes/gcc/gcc-cross_nios2-3.4.6.bb b/recipes/gcc/gcc-cross_nios2-3.4.6.bb
index 873b85f349..ae439f9409 100644
--- a/recipes/gcc/gcc-cross_nios2-3.4.6.bb
+++ b/recipes/gcc/gcc-cross_nios2-3.4.6.bb
@@ -4,3 +4,6 @@ require gcc_nios2-3.4.6.inc
 require gcc-cross.inc
 require gcc-configure-cross.inc
 require gcc-package-cross.inc
+
+DEPENDS += "elf2flt-cross"
+
diff --git a/recipes/gcc/gcc_nios2-3.4.6.inc b/recipes/gcc/gcc_nios2-3.4.6.inc
index f8094932f1..9b2a54aaf7 100644
--- a/recipes/gcc/gcc_nios2-3.4.6.inc
+++ b/recipes/gcc/gcc_nios2-3.4.6.inc
@@ -2,17 +2,15 @@ JAVA = ""
 FORTRAN = ""
 OBJC = ""
 SHARED_LIBRARIES = "no"
-DEPENDS += " elf2flt-cross "
 EXTRA_OECONF_append_nios2 = " --enable-cxx-flags=-static "
 require gcc-common.inc
+#DEPENDS += "elf2flt-cross"
 
 BINV = "3.4.6"
 PV = "nios2-3.4.6"
 
-SRCREV = "b773f7eccc6cc2ffa8fa2bd201ea62f24ba0bb41"
 GCCREV = "b773f7eccc6cc2ffa8fa2bd201ea62f24ba0bb41"
-
-#SRC_URI = "git://sopc.et.ntust.edu.tw/git/gcc3.git;protocol=git;branch=nios2-linux"
+SRCREV = "b773f7eccc6cc2ffa8fa2bd201ea62f24ba0bb41"
 
 SRC_URI = "git://sopc.et.ntust.edu.tw/git/gcc3.git;protocol=http;branch=nios2-linux"