diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-09-05 22:14:45 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-09-06 23:01:49 +0100 |
| commit | 8a726d14a345ef35c6d8d8e369bf3691cee879bf (patch) | |
| tree | eb8f134e11bec695a940f33ce5f577796cf67e17 /meta | |
| parent | 8e971a457427ad3999ff3cf4c9be3c141d6bb7be (diff) | |
| download | openembedded-core-8a726d14a345ef35c6d8d8e369bf3691cee879bf.tar.gz openembedded-core-8a726d14a345ef35c6d8d8e369bf3691cee879bf.tar.bz2 openembedded-core-8a726d14a345ef35c6d8d8e369bf3691cee879bf.zip | |
gcc-runtime: Add packaging for libgfortran (and also tweak others)
Add packaging for libgfortran and libquadmath as well as tweak the packaging
for libmudflap since it was broken.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-devtools/gcc/gcc-runtime.inc | 31 | ||||
| -rw-r--r-- | meta/recipes-devtools/gcc/gcc-target.inc | 1 |
2 files changed, 27 insertions, 5 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-runtime.inc b/meta/recipes-devtools/gcc/gcc-runtime.inc index b88288963e..2599760569 100644 --- a/meta/recipes-devtools/gcc/gcc-runtime.inc +++ b/meta/recipes-devtools/gcc/gcc-runtime.inc @@ -48,6 +48,7 @@ do_install () { oe_runmake 'DESTDIR=${D}' MULTIBUILDTOP=${B}/$target/$d/ install done rm -rf ${D}${infodir}/libgomp.info ${D}${infodir}/dir + rm -rf ${D}${infodir}/libquadmath.info ${D}${infodir}/dir if [ -d ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/finclude ]; then rmdir --ignore-fail-on-non-empty -p ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/finclude fi @@ -76,8 +77,13 @@ PACKAGES = "\ libssp-staticdev \ libgfortran \ libgfortran-dev \ + libgfortran-staticdev \ libmudflap \ libmudflap-dev \ + libmudflap-staticdev \ + libquadmath \ + libquadmath-dev \ + libquadmath-staticdev \ libgomp \ libgomp-dev \ libgomp-staticdev \ @@ -119,15 +125,30 @@ FILES_libssp-staticdev = " \ FILES_libgfortran = "${libdir}/libgfortran.so.*" FILES_libgfortran-dev = " \ - ${libdir}/libgfortran.a \ - ${libdir}/libgfortran.so \ - ${libdir}/libgfortranbegin.a" + ${libdir}/libgfortran*.so \ + ${libdir}/libgfortran.spec \ + ${libdir}/libgfortran.la \ + ${libdir}/gcc/${TARGET_SYS}/${BINV}/libgfortranbegin.* \ + ${libdir}/gcc/${TARGET_SYS}/${BINV}/libcaf_single*" +FILES_libgfortran-staticdev = " \ + ${libdir}/libgfortran.a" + +INSANE_SKIP_${MLPREFIX}libgfortran-dev = "staticdev" + +FILES_libquadmath = "${libdir}/libquadmath*.so.*" +FILES_libquadmath-dev = "\ + ${libdir}/gcc/${TARGET_SYS}/${BINV}/include/quadmath* \ + ${libdir}/libquadmath*.so \ + ${libdir}/libquadmath.la" +FILES_libquadmath-staticdev = "\ + ${libdir}/libquadmath.a" FILES_libmudflap = "${libdir}/libmudflap*.so.*" FILES_libmudflap-dev = "\ ${libdir}/libmudflap*.so \ - ${libdir}/libmudflap*.a \ - ${libdir}/libmudflap*.la" + ${libdir}/libmudflap.la" +FILES_libmudflap-staticdev = "\ + ${libdir}/libmudflap.a" FILES_libgomp = "${libdir}/libgomp*${SOLIBS}" FILES_libgomp-dev = "\ diff --git a/meta/recipes-devtools/gcc/gcc-target.inc b/meta/recipes-devtools/gcc/gcc-target.inc index 150fbba419..c7e3e164d8 100644 --- a/meta/recipes-devtools/gcc/gcc-target.inc +++ b/meta/recipes-devtools/gcc/gcc-target.inc @@ -110,6 +110,7 @@ do_install () { rm -r ${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/install-tools rm -rf ${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/*.la rmdir ${D}${includedir} + rm -rf ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/finclude # Hack around specs file assumptions test -f ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/specs && sed -i -e '/^*cross_compile:$/ { n; s/1/0/; }' ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/specs |