summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-05 22:14:45 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-06 23:03:56 +0100
commit95d413d03f66299aa7a835e84dd8ce00d623da6d (patch)
treee2354e0c2e6f79ed4fc1d1a6bde6ffc2dd8f952a
parent835b5c1504d2edc415143e9bae981290e457d82a (diff)
downloadpoky-95d413d03f66299aa7a835e84dd8ce00d623da6d.tar.gz
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. (From OE-Core rev: 8a726d14a345ef35c6d8d8e369bf3691cee879bf) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/gcc/gcc-runtime.inc31
-rw-r--r--meta/recipes-devtools/gcc/gcc-target.inc1
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 () {
48 oe_runmake 'DESTDIR=${D}' MULTIBUILDTOP=${B}/$target/$d/ install 48 oe_runmake 'DESTDIR=${D}' MULTIBUILDTOP=${B}/$target/$d/ install
49 done 49 done
50 rm -rf ${D}${infodir}/libgomp.info ${D}${infodir}/dir 50 rm -rf ${D}${infodir}/libgomp.info ${D}${infodir}/dir
51 rm -rf ${D}${infodir}/libquadmath.info ${D}${infodir}/dir
51 if [ -d ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/finclude ]; then 52 if [ -d ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/finclude ]; then
52 rmdir --ignore-fail-on-non-empty -p ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/finclude 53 rmdir --ignore-fail-on-non-empty -p ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/finclude
53 fi 54 fi
@@ -76,8 +77,13 @@ PACKAGES = "\
76 libssp-staticdev \ 77 libssp-staticdev \
77 libgfortran \ 78 libgfortran \
78 libgfortran-dev \ 79 libgfortran-dev \
80 libgfortran-staticdev \
79 libmudflap \ 81 libmudflap \
80 libmudflap-dev \ 82 libmudflap-dev \
83 libmudflap-staticdev \
84 libquadmath \
85 libquadmath-dev \
86 libquadmath-staticdev \
81 libgomp \ 87 libgomp \
82 libgomp-dev \ 88 libgomp-dev \
83 libgomp-staticdev \ 89 libgomp-staticdev \
@@ -119,15 +125,30 @@ FILES_libssp-staticdev = " \
119 125
120FILES_libgfortran = "${libdir}/libgfortran.so.*" 126FILES_libgfortran = "${libdir}/libgfortran.so.*"
121FILES_libgfortran-dev = " \ 127FILES_libgfortran-dev = " \
122 ${libdir}/libgfortran.a \ 128 ${libdir}/libgfortran*.so \
123 ${libdir}/libgfortran.so \ 129 ${libdir}/libgfortran.spec \
124 ${libdir}/libgfortranbegin.a" 130 ${libdir}/libgfortran.la \
131 ${libdir}/gcc/${TARGET_SYS}/${BINV}/libgfortranbegin.* \
132 ${libdir}/gcc/${TARGET_SYS}/${BINV}/libcaf_single*"
133FILES_libgfortran-staticdev = " \
134 ${libdir}/libgfortran.a"
135
136INSANE_SKIP_${MLPREFIX}libgfortran-dev = "staticdev"
137
138FILES_libquadmath = "${libdir}/libquadmath*.so.*"
139FILES_libquadmath-dev = "\
140 ${libdir}/gcc/${TARGET_SYS}/${BINV}/include/quadmath* \
141 ${libdir}/libquadmath*.so \
142 ${libdir}/libquadmath.la"
143FILES_libquadmath-staticdev = "\
144 ${libdir}/libquadmath.a"
125 145
126FILES_libmudflap = "${libdir}/libmudflap*.so.*" 146FILES_libmudflap = "${libdir}/libmudflap*.so.*"
127FILES_libmudflap-dev = "\ 147FILES_libmudflap-dev = "\
128 ${libdir}/libmudflap*.so \ 148 ${libdir}/libmudflap*.so \
129 ${libdir}/libmudflap*.a \ 149 ${libdir}/libmudflap.la"
130 ${libdir}/libmudflap*.la" 150FILES_libmudflap-staticdev = "\
151 ${libdir}/libmudflap.a"
131 152
132FILES_libgomp = "${libdir}/libgomp*${SOLIBS}" 153FILES_libgomp = "${libdir}/libgomp*${SOLIBS}"
133FILES_libgomp-dev = "\ 154FILES_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 () {
110 rm -r ${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/install-tools 110 rm -r ${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/install-tools
111 rm -rf ${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/*.la 111 rm -rf ${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/*.la
112 rmdir ${D}${includedir} 112 rmdir ${D}${includedir}
113 rm -rf ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/finclude
113 114
114 # Hack around specs file assumptions 115 # Hack around specs file assumptions
115 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 116 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