summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/gcc/gcc-4.7.inc2
-rw-r--r--meta/recipes-devtools/gcc/gcc-configure-runtime.inc7
-rw-r--r--meta/recipes-devtools/gcc/gcc-package-runtime.inc14
3 files changed, 21 insertions, 2 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-4.7.inc b/meta/recipes-devtools/gcc/gcc-4.7.inc
index be142a13fb..0e40533dd7 100644
--- a/meta/recipes-devtools/gcc/gcc-4.7.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.7.inc
@@ -1,6 +1,6 @@
1require gcc-common.inc 1require gcc-common.inc
2 2
3PR = "r4" 3PR = "r5"
4 4
5# Third digit in PV should be incremented after a minor release 5# Third digit in PV should be incremented after a minor release
6# happens from this branch on gcc e.g. currently its 4.7.1 6# happens from this branch on gcc e.g. currently its 4.7.1
diff --git a/meta/recipes-devtools/gcc/gcc-configure-runtime.inc b/meta/recipes-devtools/gcc/gcc-configure-runtime.inc
index 095d6c16d2..d40383cea5 100644
--- a/meta/recipes-devtools/gcc/gcc-configure-runtime.inc
+++ b/meta/recipes-devtools/gcc/gcc-configure-runtime.inc
@@ -8,6 +8,8 @@ EXTRA_OECONF_PATHS = " \
8 --with-build-sysroot=${STAGING_DIR_TARGET}" 8 --with-build-sysroot=${STAGING_DIR_TARGET}"
9 9
10RUNTIMETARGET = "libssp libstdc++-v3" 10RUNTIMETARGET = "libssp libstdc++-v3"
11RUNTIMETARGET_append_powerpc = " libgomp"
12RUNTIMETARGET_append_powerpc64 = " libgomp"
11# ? 13# ?
12# libiberty 14# libiberty
13# libmudflap 15# libmudflap
@@ -41,6 +43,11 @@ do_install () {
41 for d in ${RUNTIMETARGET}; do 43 for d in ${RUNTIMETARGET}; do
42 cd ${B}/$target/$d/ 44 cd ${B}/$target/$d/
43 oe_runmake 'DESTDIR=${D}' MULTIBUILDTOP=${B}/$target/$d/ install 45 oe_runmake 'DESTDIR=${D}' MULTIBUILDTOP=${B}/$target/$d/ install
46 if [ "$d" = "libgomp" ]; then
47 rm -rf ${D}${datadir}/info/libgomp.info ${D}${datadir}/info/dir
48 rmdir --ignore-fail-on-non-empty -p ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/finclude
49 rmdir --ignore-fail-on-non-empty -p ${D}${datadir}/info
50 fi
44 done 51 done
45 chown -R root:root ${D} 52 chown -R root:root ${D}
46} 53}
diff --git a/meta/recipes-devtools/gcc/gcc-package-runtime.inc b/meta/recipes-devtools/gcc/gcc-package-runtime.inc
index e0cb51b062..a81e3b7879 100644
--- a/meta/recipes-devtools/gcc/gcc-package-runtime.inc
+++ b/meta/recipes-devtools/gcc/gcc-package-runtime.inc
@@ -13,6 +13,9 @@ PACKAGES = "\
13 libgfortran-dev \ 13 libgfortran-dev \
14 libmudflap \ 14 libmudflap \
15 libmudflap-dev \ 15 libmudflap-dev \
16 libgomp \
17 libgomp-dev \
18 libgomp-staticdev \
16" 19"
17# The base package doesn't exist, so we clear the recommends. 20# The base package doesn't exist, so we clear the recommends.
18RRECOMMENDS_${PN}-dbg = "" 21RRECOMMENDS_${PN}-dbg = ""
@@ -61,7 +64,16 @@ FILES_libmudflap-dev = "\
61 ${libdir}/libmudflap*.a \ 64 ${libdir}/libmudflap*.a \
62 ${libdir}/libmudflap*.la" 65 ${libdir}/libmudflap*.la"
63 66
67FILES_libgomp-dev = "\
68 ${libdir}/libgomp*.so \
69 ${libdir}/libgomp*.la \
70 ${libdir}/libgomp.spec \
71 ${libdir}/gcc/${TARGET_SYS}/${BINV}/include/omp.h \
72 "
73FILES_libgomp-staticdev = "\
74 ${libdir}/libgomp*.a \
75 "
76
64do_package_write_ipk[depends] += "virtual/${MLPREFIX}libc:do_package" 77do_package_write_ipk[depends] += "virtual/${MLPREFIX}libc:do_package"
65do_package_write_deb[depends] += "virtual/${MLPREFIX}libc:do_package" 78do_package_write_deb[depends] += "virtual/${MLPREFIX}libc:do_package"
66do_package_write_rpm[depends] += "virtual/${MLPREFIX}libc:do_package" 79do_package_write_rpm[depends] += "virtual/${MLPREFIX}libc:do_package"
67