Re: [RFT] GCC 4.8 recipes

[Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>]

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

W dniu 28.03.2013 10:02, Marcin Juszkiewicz pisze:
> W dniu 28.03.2013 06:51, Khem Raj pisze:
>> I have added gcc 4.8 recipes and the branch is here 
>>
>> git://git.openembedded.org/openembedded-core-contrib kraj/gcc-4.8
> 
> Übercool! Will do tests with aarch64.

After some hacking (see attachment) I got it built and booted
core-image-minimal.

Problem was with paths - lib contra lib64. Will look at it more next week.


[-- Attachment #2: aarch64.diff --]
[-- Type: text/x-diff, Size: 1492 bytes --]

diff --git a/meta/recipes-devtools/gcc/gcc-package-runtime.inc b/meta/recipes-devtools/gcc/gcc-package-runtime.inc
index 2e2f75a..39f053c 100644
--- a/meta/recipes-devtools/gcc/gcc-package-runtime.inc
+++ b/meta/recipes-devtools/gcc/gcc-package-runtime.inc
@@ -78,3 +78,13 @@ FILES_libgomp-staticdev = "\
 do_package_write_ipk[depends] += "virtual/${MLPREFIX}libc:do_packagedata"
 do_package_write_deb[depends] += "virtual/${MLPREFIX}libc:do_packagedata"
 do_package_write_rpm[depends] += "virtual/${MLPREFIX}libc:do_packagedata"
+
+do_install_append_aarch64() {
+
+    if [ -d ${D}${libdir}64 ]; then
+        mv ${D}${libdir}64/* ${D}${libdir}
+    fi
+    if [ -d ${D}${libdir}64/.debug ]; then
+        mv ${D}${libdir}64/.debug ${D}${libdir}/.debug
+    fi
+}
diff --git a/meta/recipes-devtools/gcc/libgcc_4.8.bb b/meta/recipes-devtools/gcc/libgcc_4.8.bb
index 47669a2..51ed2ff 100644
--- a/meta/recipes-devtools/gcc/libgcc_4.8.bb
+++ b/meta/recipes-devtools/gcc/libgcc_4.8.bb
@@ -51,7 +51,11 @@ do_install () {
 	if [ -f ${D}${libdir}/nof/libgcc_s.so ]; then
 		mv ${D}${libdir}/nof/libgcc* ${D}${base_libdir}
 	else
-		mv ${D}${libdir}/libgcc* ${D}${base_libdir} || true
+        if [ -f ${D}${libdir}64/libgcc_s.so ]; then
+            mv ${D}${libdir}64/libgcc* ${D}${base_libdir}
+        else
+            mv ${D}${libdir}64/libgcc* ${D}${base_libdir} || true
+        fi
 	fi
 
 	# install the runtime in /usr/lib/ not in /usr/lib/gcc on target