summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-08-22 09:50:09 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-08-23 16:20:13 +0100
commitaa77ec7eef910635a5882aa83bbd96f13676d8d0 (patch)
tree16c56947a8bd1ce0935d405b236ea74612a6bcfa /meta/recipes-devtools
parent2eb9c1cc75a0f39390ddfcc3688fa4893fb77991 (diff)
downloadpoky-aa77ec7eef910635a5882aa83bbd96f13676d8d0.tar.gz
gcc-*-runtime.inc: Fold configuration into gcc-runtime.inc
(From OE-Core rev: 9cdfd55de8dbdea3d5e5ed25fbc67d1f198a069a) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/gcc/gcc-configure-runtime.inc64
-rw-r--r--meta/recipes-devtools/gcc/gcc-runtime.inc (renamed from meta/recipes-devtools/gcc/gcc-package-runtime.inc)65
-rw-r--r--meta/recipes-devtools/gcc/gcc-runtime_4.7.bb3
-rw-r--r--meta/recipes-devtools/gcc/gcc-runtime_4.8.bb3
4 files changed, 67 insertions, 68 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-configure-runtime.inc b/meta/recipes-devtools/gcc/gcc-configure-runtime.inc
deleted file mode 100644
index 2ff8561e0d..0000000000
--- a/meta/recipes-devtools/gcc/gcc-configure-runtime.inc
+++ /dev/null
@@ -1,64 +0,0 @@
1require gcc-configure-common.inc
2
3CXXFLAGS := "${@oe_filter_out('-fvisibility-inlines-hidden', '${CXXFLAGS}', d)}"
4
5EXTRA_OECONF_PATHS = " \
6 --with-gxx-include-dir=${includedir}/c++/ \
7 --with-sysroot=${STAGING_DIR_TARGET} \
8 --with-build-sysroot=${STAGING_DIR_TARGET}"
9
10ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}"
11
12EXTRA_OECONF += "--disable-libunwind-exceptions"
13EXTRA_OECONF_append_linuxstdbase = " --enable-clocale=gnu"
14
15RUNTIMETARGET = "libssp libstdc++-v3 libgomp"
16# ?
17# libiberty
18# libmudflap
19# libgfortran
20
21do_configure () {
22 export CXX="${CXX} -nostdinc++ -nostdlib++"
23 mtarget=`echo ${MULTIMACH_TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##`
24 target=`echo ${TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##`
25 cp -fpPR ${STAGING_INCDIR_NATIVE}/gcc-build-internal-$mtarget/* ${B}
26 for d in libgcc ${RUNTIMETARGET}; do
27 echo "Configuring $d"
28 rm -rf ${B}/$target/$d/
29 mkdir -p ${B}/$target/$d/
30 cd ${B}/$target/$d/
31 chmod a+x ${S}/$d/configure
32 ${S}/$d/configure ${CONFIGUREOPTS} ${EXTRA_OECONF}
33 done
34}
35
36do_compile () {
37 target=`echo ${TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##`
38 for d in libgcc ${RUNTIMETARGET}; do
39 cd ${B}/$target/$d/
40 oe_runmake MULTIBUILDTOP=${B}/$target/$d/
41 done
42}
43
44do_install () {
45 target=`echo ${TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##`
46 for d in ${RUNTIMETARGET}; do
47 cd ${B}/$target/$d/
48 oe_runmake 'DESTDIR=${D}' MULTIBUILDTOP=${B}/$target/$d/ install
49 done
50 rm -rf ${D}${infodir}/libgomp.info ${D}${infodir}/dir
51 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 fi
54 if [ -d ${D}${infodir} ]; then
55 rmdir --ignore-fail-on-non-empty -p ${D}${infodir}
56 fi
57 chown -R root:root ${D}
58}
59
60INHIBIT_DEFAULT_DEPS = "1"
61DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++ libgcc"
62PROVIDES = "virtual/${TARGET_PREFIX}compilerlibs"
63
64BBCLASSEXTEND = "nativesdk"
diff --git a/meta/recipes-devtools/gcc/gcc-package-runtime.inc b/meta/recipes-devtools/gcc/gcc-runtime.inc
index 2e2f75ab3a..b88288963e 100644
--- a/meta/recipes-devtools/gcc/gcc-package-runtime.inc
+++ b/meta/recipes-devtools/gcc/gcc-runtime.inc
@@ -1,3 +1,68 @@
1require gcc-configure-common.inc
2
3CXXFLAGS := "${@oe_filter_out('-fvisibility-inlines-hidden', '${CXXFLAGS}', d)}"
4
5EXTRA_OECONF_PATHS = " \
6 --with-gxx-include-dir=${includedir}/c++/ \
7 --with-sysroot=${STAGING_DIR_TARGET} \
8 --with-build-sysroot=${STAGING_DIR_TARGET}"
9
10ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}"
11
12EXTRA_OECONF += "--disable-libunwind-exceptions"
13EXTRA_OECONF_append_linuxstdbase = " --enable-clocale=gnu"
14
15RUNTIMETARGET = "libssp libstdc++-v3 libgomp"
16# ?
17# libiberty
18# libmudflap
19# libgfortran
20
21do_configure () {
22 export CXX="${CXX} -nostdinc++ -nostdlib++"
23 mtarget=`echo ${MULTIMACH_TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##`
24 target=`echo ${TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##`
25 cp -fpPR ${STAGING_INCDIR_NATIVE}/gcc-build-internal-$mtarget/* ${B}
26 for d in libgcc ${RUNTIMETARGET}; do
27 echo "Configuring $d"
28 rm -rf ${B}/$target/$d/
29 mkdir -p ${B}/$target/$d/
30 cd ${B}/$target/$d/
31 chmod a+x ${S}/$d/configure
32 ${S}/$d/configure ${CONFIGUREOPTS} ${EXTRA_OECONF}
33 done
34}
35
36do_compile () {
37 target=`echo ${TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##`
38 for d in libgcc ${RUNTIMETARGET}; do
39 cd ${B}/$target/$d/
40 oe_runmake MULTIBUILDTOP=${B}/$target/$d/
41 done
42}
43
44do_install () {
45 target=`echo ${TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##`
46 for d in ${RUNTIMETARGET}; do
47 cd ${B}/$target/$d/
48 oe_runmake 'DESTDIR=${D}' MULTIBUILDTOP=${B}/$target/$d/ install
49 done
50 rm -rf ${D}${infodir}/libgomp.info ${D}${infodir}/dir
51 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 fi
54 if [ -d ${D}${infodir} ]; then
55 rmdir --ignore-fail-on-non-empty -p ${D}${infodir}
56 fi
57 chown -R root:root ${D}
58}
59
60INHIBIT_DEFAULT_DEPS = "1"
61DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++ libgcc"
62PROVIDES = "virtual/${TARGET_PREFIX}compilerlibs"
63
64BBCLASSEXTEND = "nativesdk"
65
1PACKAGES = "\ 66PACKAGES = "\
2 ${PN}-dbg \ 67 ${PN}-dbg \
3 libstdc++ \ 68 libstdc++ \
diff --git a/meta/recipes-devtools/gcc/gcc-runtime_4.7.bb b/meta/recipes-devtools/gcc/gcc-runtime_4.7.bb
index c16d27eecd..497d691688 100644
--- a/meta/recipes-devtools/gcc/gcc-runtime_4.7.bb
+++ b/meta/recipes-devtools/gcc/gcc-runtime_4.7.bb
@@ -1,4 +1,3 @@
1require recipes-devtools/gcc/gcc-${PV}.inc 1require recipes-devtools/gcc/gcc-${PV}.inc
2require gcc-configure-runtime.inc 2require gcc-runtime.inc
3require gcc-package-runtime.inc
4 3
diff --git a/meta/recipes-devtools/gcc/gcc-runtime_4.8.bb b/meta/recipes-devtools/gcc/gcc-runtime_4.8.bb
index c16d27eecd..497d691688 100644
--- a/meta/recipes-devtools/gcc/gcc-runtime_4.8.bb
+++ b/meta/recipes-devtools/gcc/gcc-runtime_4.8.bb
@@ -1,4 +1,3 @@
1require recipes-devtools/gcc/gcc-${PV}.inc 1require recipes-devtools/gcc/gcc-${PV}.inc
2require gcc-configure-runtime.inc 2require gcc-runtime.inc
3require gcc-package-runtime.inc
4 3