Native gcc already has ${libdir}/gcc/${TARGET_SYS} and expects gcc-runtime to 
be there.

Signed-off-by: Denys Dmytriyenko <[email protected]>
---
 .../meta/external-arm-toolchain.bbappend           | 36 ++++++++++++++++++++--
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git 
a/meta-arago-extras/recipes-core/meta/external-arm-toolchain.bbappend 
b/meta-arago-extras/recipes-core/meta/external-arm-toolchain.bbappend
index af9d6cd..a5d6329 100644
--- a/meta-arago-extras/recipes-core/meta/external-arm-toolchain.bbappend
+++ b/meta-arago-extras/recipes-core/meta/external-arm-toolchain.bbappend
@@ -8,8 +8,9 @@ do_install_append() {
 
        if [ ${EAT_TARGET_SYS} != ${ORIG_TARGET_SYS} ]; then
                ln -sf ${EAT_TARGET_SYS} ${D}${libdir}/${ORIG_TARGET_SYS}
-               ln -sf ${EAT_TARGET_SYS} ${D}${libdir}/gcc/${ORIG_TARGET_SYS}
                ln -sf ${EAT_TARGET_SYS} 
${D}${includedir}/c++/${EAT_VER_GCC}/${ORIG_TARGET_SYS}
+               mv ${D}${libdir}/gcc/${EAT_TARGET_SYS} 
${D}${libdir}/gcc/${ORIG_TARGET_SYS}
+               ln -sf ${ORIG_TARGET_SYS} ${D}${libdir}/gcc/${EAT_TARGET_SYS}
        fi
 
        ln -sf libatomic.so.1 ${D}${libdir}/libatomic.so
@@ -22,6 +23,35 @@ do_install_append() {
        ln -sf libgfortran.so.5 ${D}${libdir}/libgfortran.so
 }
 
-FILES_libgomp-dev += "\
-    ${libdir}/gcc/${ORIG_TARGET_SYS} \
+FILES_libgcc-dev += "\
+    ${libdir}/gcc/${TARGET_SYS} \
+"
+
+FILES_libgfortran-dev = "\
+    ${libdir}/libgfortran*.so \
+    ${libdir}/libgfortran.spec \
+    ${libdir}/libgfortran.la \
+    ${libdir}/gcc/${ORIG_TARGET_SYS}/${BINV}/libgfortranbegin.* \
+    ${libdir}/gcc/${ORIG_TARGET_SYS}/${BINV}/libcaf_single* \
+    ${libdir}/gcc/${ORIG_TARGET_SYS}/${BINV}/finclude/ \
+"
+
+FILES_libssp-dev = "\
+    ${libdir}/libssp*.so \
+    ${libdir}/libssp*_nonshared.a \
+    ${libdir}/libssp*.la \
+    ${libdir}/gcc/${ORIG_TARGET_SYS}/${BINV}/include/ssp \
+"
+
+FILES_libquadmath-dev = "\
+    ${libdir}/libquadmath*.so \
+    ${libdir}/libquadmath.la \
+    ${libdir}/gcc/${ORIG_TARGET_SYS}/${BINV}/include/quadmath* \
+"
+
+FILES_libgomp-dev = "\
+    ${libdir}/libgomp*${SOLIBSDEV} \
+    ${libdir}/libgomp*.la \
+    ${libdir}/libgomp.spec \
+    ${libdir}/gcc/${ORIG_TARGET_SYS}/${BINV}/include/omp.h \
 "
-- 
2.7.4

_______________________________________________
meta-arago mailing list
[email protected]
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago

Reply via email to