summaryrefslogtreecommitdiffstats
path: root/meta/packages
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-03-31 11:19:54 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2010-03-31 11:19:54 +0100
commit95fd9943663d97f146065f23448721480743c0dc (patch)
tree25282c822edd9908e001e181f8d9fd314a3f9c79 /meta/packages
parentccebaa67df90e8c3a250cf401d616f40dc69daa7 (diff)
downloadpoky-95fd9943663d97f146065f23448721480743c0dc.tar.gz
gcc-runtime: Move core code to the main include file
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/packages')
-rw-r--r--meta/packages/gcc/gcc-configure-runtime.inc46
-rw-r--r--meta/packages/gcc/gcc-package-runtime.inc14
-rw-r--r--meta/packages/gcc/gcc-runtime_4.3.3.bb36
3 files changed, 47 insertions, 49 deletions
diff --git a/meta/packages/gcc/gcc-configure-runtime.inc b/meta/packages/gcc/gcc-configure-runtime.inc
index 8b169a7c54..e20c72fa05 100644
--- a/meta/packages/gcc/gcc-configure-runtime.inc
+++ b/meta/packages/gcc/gcc-configure-runtime.inc
@@ -3,3 +3,49 @@ require gcc-configure-common.inc
3EXTRA_OECONF_PATHS = " \ 3EXTRA_OECONF_PATHS = " \
4 --with-local-prefix=${STAGING_DIR_TARGET}${prefix} \ 4 --with-local-prefix=${STAGING_DIR_TARGET}${prefix} \
5 --with-gxx-include-dir=${includedir}/c++/" 5 --with-gxx-include-dir=${includedir}/c++/"
6
7RUNTIMETARGET = "libgcc libssp libstdc++-v3"
8# ?
9# libiberty
10# libmudflap
11# libgfortran
12
13do_configure () {
14 cp ${CROSS_DIR}/include/gcc-build-internal/* ${S}/gcc
15 for d in ${RUNTIMETARGET}; do
16 echo "Configuring $d"
17 mkdir -p ${B}/$d/
18 cd ${B}/$d/
19 chmod a+x ${S}/$d/configure
20 ${S}/$d/configure ${CONFIGUREOPTS} ${EXTRA_OECONF_PATHS}
21 done
22}
23
24do_compile () {
25 for d in ${RUNTIMETARGET}; do
26 cd ${B}/$d/
27 oe_runmake
28 done
29}
30
31do_install () {
32 for d in ${RUNTIMETARGET}; do
33 cd ${B}/$d/
34 oe_runmake 'DESTDIR=${D}' install
35 done
36
37 # Move libgcc_s into /lib
38 mkdir -p ${D}${base_libdir}
39 if [ -f ${D}${libdir}/nof/libgcc_s.so ]; then
40 mv ${D}${libdir}/nof/libgcc* ${D}${base_libdir}
41 else
42 mv ${D}${libdir}/libgcc* ${D}${base_libdir} || true
43 fi
44}
45
46INHIBIT_DEFAULT_DEPS = "1"
47DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
48PROVIDES = "virtual/${TARGET_PREFIX}compilerlibs"
49
50BBCLASSEXTEND = "nativesdk"
51
diff --git a/meta/packages/gcc/gcc-package-runtime.inc b/meta/packages/gcc/gcc-package-runtime.inc
index 055753b8ea..908d2d513c 100644
--- a/meta/packages/gcc/gcc-package-runtime.inc
+++ b/meta/packages/gcc/gcc-package-runtime.inc
@@ -35,7 +35,7 @@ FILES_libstdc++-dev = "\
35 ${libdir}/libsupc++.la \ 35 ${libdir}/libsupc++.la \
36 ${libdir}/libsupc++.a" 36 ${libdir}/libsupc++.a"
37 37
38FILES_libstdc++-precompile-dev = "${includedir}/c++/${BINV}/${TARGET_SYS}/bits/*.gch" 38FILES_libstdc++-precompile-dev = "${includedir}/c++/${TARGET_SYS}/bits/*.gch"
39 39
40FILES_libssp = "${libdir}/libssp.so.*" 40FILES_libssp = "${libdir}/libssp.so.*"
41FILES_libssp-dev = " \ 41FILES_libssp-dev = " \
@@ -56,15 +56,3 @@ FILES_libmudflap-dev = "\
56 ${libdir}/libmudflap*.a \ 56 ${libdir}/libmudflap*.a \
57 ${libdir}/libmudflap*.la" 57 ${libdir}/libmudflap*.la"
58 58
59
60do_install () {
61 oe_runmake 'DESTDIR=${D}' install-target
62
63 # Move libgcc_s into /lib
64 mkdir -p ${D}${base_libdir}
65 if [ -f ${D}${libdir}/nof/libgcc_s.so ]; then
66 mv ${D}${libdir}/nof/libgcc* ${D}${base_libdir}
67 else
68 mv ${D}${libdir}/libgcc* ${D}${base_libdir} || true
69 fi
70}
diff --git a/meta/packages/gcc/gcc-runtime_4.3.3.bb b/meta/packages/gcc/gcc-runtime_4.3.3.bb
index 0119a41478..b625668be0 100644
--- a/meta/packages/gcc/gcc-runtime_4.3.3.bb
+++ b/meta/packages/gcc/gcc-runtime_4.3.3.bb
@@ -8,39 +8,3 @@ SRC_URI_append = "file://fortran-cross-compile-hack.patch;patch=1"
8 8
9ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}" 9ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}"
10 10
11RUNTIMETARGET = "libgcc libssp libstdc++-v3"
12# ?
13# libiberty
14# libmudflap
15# libgfortran
16
17do_configure () {
18 cp ${CROSS_DIR}/include/gcc-build-internal/* ${S}/gcc
19 for d in ${RUNTIMETARGET}; do
20 echo "Configuring $d"
21 mkdir -p ${B}/$d/
22 cd ${B}/$d/
23 chmod a+x ${S}/$d/configure
24 ${S}/$d/configure ${CONFIGUREOPTS} ${EXTRA_OECONF_PATHS}
25 done
26}
27
28do_compile () {
29 for d in ${RUNTIMETARGET}; do
30 cd ${B}/$d/
31 oe_runmake
32 done
33}
34
35do_install () {
36 for d in ${RUNTIMETARGET}; do
37 cd ${B}/$d/
38 oe_runmake 'DESTDIR=${D}' install
39 done
40}
41
42INHIBIT_DEFAULT_DEPS = "1"
43DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
44PROVIDES = "virtual/${TARGET_PREFIX}compilerlibs"
45
46BBCLASSEXTEND = "nativesdk"