From: Denys Dmytriyenko <[email protected]>
Signed-off-by: Denys Dmytriyenko <[email protected]>
---
.../meta/external-linaro-toolchain.bbappend | 29 +++++++++++++++++++---
1 file changed, 25 insertions(+), 4 deletions(-)
diff --git
a/meta-arago-extras/recipes-core/meta/external-linaro-toolchain.bbappend
b/meta-arago-extras/recipes-core/meta/external-linaro-toolchain.bbappend
index 467fe9f..a979181 100644
--- a/meta-arago-extras/recipes-core/meta/external-linaro-toolchain.bbappend
+++ b/meta-arago-extras/recipes-core/meta/external-linaro-toolchain.bbappend
@@ -4,7 +4,7 @@ ALLOW_EMPTY_ldd = "1"
ALLOW_EMPTY_libstdc++ = "1"
ALLOW_EMPTY_libgomp = "1"
-PR_append = "-arago23"
+PR_append = "-arago24"
PROVIDES := "${@oe_filter_out('virtual/linux-libc-headers', '${PROVIDES}', d)}"
PROVIDES := "${@oe_filter_out('linux-libc-headers', '${PROVIDES}', d)}"
@@ -90,18 +90,39 @@ FILES_libgcc-dev += "\
${libdir}/libgcc.a \
"
+FILES_libstdc++-dev += "\
+ /include/c++/ \
+"
+
+FILES_libgomp-dev += "\
+ ${libdir}/gcc/${ELT_TARGET_SYS}/${ELT_VER_GCC}/include/omp.h \
+"
+
do_install_append() {
mv ${D}${base_libdir}/libc.so ${D}${libdir}/libc.so || true
mv ${D}${base_libdir}/libpthread.so ${D}${libdir}/libpthread.so || true
+ ln -sf ../../lib/libc.so.6 ${D}${libdir}/libc.so.6
+ ln -sf ../../lib/libpthread.so.0 ${D}${libdir}/libpthread.so.0
+
+ sed -i -e "s# /lib/${ELT_TARGET_SYS}# ../../lib#g" -e "s#
/usr/lib/${ELT_TARGET_SYS}# .#g" -e "s# /lib/ld-linux# ../../lib/ld-linux#g"
${D}${libdir}/libc.so
+ sed -i -e "s# /lib/# ../../lib/#g" -e "s# /usr/lib/# ./#g"
${D}${libdir}/libc.so
+
+ sed -i -e "s# /lib/${ELT_TARGET_SYS}# ../../lib#g" -e "s#
/usr/lib/${ELT_TARGET_SYS}# .#g" ${D}${libdir}/libpthread.so
+ sed -i -e "s# /lib/# ../../lib/#g" -e "s# /usr/lib/# ./#g"
${D}${libdir}/libpthread.so
+
+
install -d ${D}${base_sbindir}
cp -a ${TOOLCHAIN_PATH}/${ELT_TARGET_SYS}/libc/${base_sbindir}/ldconfig
${D}${base_sbindir}/
install -d ${D}${sysconfdir}
echo -e "/lib\n/usr/lib" >> ${D}${sysconfdir}/ld.so.conf
- ( cd ${D}${libdir} && ln -sf ../../lib/libc.so.6 )
- cp -a ${TOOLCHAIN_PATH}/${ELT_TARGET_SYS}/include/* ${D}${includedir}
- ln -sf ${ELT_TARGET_SYS}
${D}${includedir}/c++/${ELT_VER_GCC}/${TARGET_SYS}
+ install -d ${D}/include
+ cp -a ${TOOLCHAIN_PATH}/${ELT_TARGET_SYS}/include/* ${D}/include
+ ln -sf ${ELT_TARGET_SYS} ${D}/include/c++/${ELT_VER_GCC}/${TARGET_SYS}
+
+ install -d ${D}${libdir}/gcc/${ELT_TARGET_SYS}/${ELT_VER_GCC}/include
+ cp -a
${TOOLCHAIN_PATH}/${base_libdir}/gcc/${ELT_TARGET_SYS}/${ELT_VER_GCC}/include/omp.h
${D}${libdir}/gcc/${ELT_TARGET_SYS}/${ELT_VER_GCC}/include
${@base_conditional('PREFERRED_PROVIDER_linux-libc-headers',
'external-linaro-toolchain', '', 'rm -rf ${D}${includedir}/asm*; rm -rf
${D}${includedir}/drm; rm -rf ${D}${includedir}/linux; rm -rf
${D}${includedir}/mtd; rm -rf ${D}${includedir}/rdma; rm -rf
${D}${includedir}/sound; rm -rf ${D}${includedir}/video', d)}
${@base_conditional('PREFERRED_PROVIDER_linux-libc-headers',
'external-linaro-toolchain', '', 'rm -rf ${D}${includedir}/uapi/.install; rm
-rf ${D}${includedir}/misc/.install; rm -rf ${D}${includedir}/misc/cxl.h; rm
-rf ${D}${includedir}/scsi/.install; rm -rf
${D}${includedir}/scsi/scsi_netlink*; rm -rf ${D}${includedir}/scsi/scsi_bsg*;
rm -rf ${D}${includedir}/scsi/fc; rm -rf ${D}${includedir}/xen', d)}
--
2.2.0
_______________________________________________
meta-arago mailing list
[email protected]
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
