Patchwork gcc-runtime: Add packaging for libgfortran (and also tweak others)

login
register
mail settings
Submitter Richard Purdie
Date Sept. 5, 2013, 9:14 p.m.
Message ID <1378415685.32427.81.camel@ted>
Download mbox | patch
Permalink /patch/57507/
State New
Headers show

Comments

Richard Purdie - Sept. 5, 2013, 9:14 p.m.
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>
---
Khem Raj - Sept. 6, 2013, 7:01 a.m.
On Sep 5, 2013, at 2:14 PM, Richard Purdie <richard.purdie@linuxfoundation.org> wrote:

> Add packaging for libgfortran and libquadmath as well as tweak the packaging
> for libmudflap since it was broken.

Looks good to me.

> 
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
> diff --git a/meta/recipes-devtools/gcc/gcc-runtime.inc b/meta/recipes-devtools/gcc/gcc-runtime.inc
> index b882889..2599760 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 = "\
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

Patch

diff --git a/meta/recipes-devtools/gcc/gcc-runtime.inc b/meta/recipes-devtools/gcc/gcc-runtime.inc
index b882889..2599760 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 = "\