summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-04-24 10:19:42 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-04-25 17:19:18 +0100
commitee758b69276d3ef8bdd7040ec8725cec2b4bad7c (patch)
tree02e2f1aceb07842100025299c3b7eae76e69ff26 /meta/recipes-devtools
parent44c80284bf7d780ac0ec04380b0c20617d56ed06 (diff)
downloadpoky-ee758b69276d3ef8bdd7040ec8725cec2b4bad7c.tar.gz
gcc-cross: Improve handling of unwind.h
Rather than building the whole of libgcc to obtain the unwind.h header file, simply configure it and then install the file. This avoids copying chunks of data around when we don't need to and building the same thing twice. After doing this we need to make sure the target build directory exists in the libgcc case since it will no longer be created automatically. (From OE-Core rev: 459e4dc25462771038459567c22e87d4cd38b117) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/gcc/gcc-4.8.inc1
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross.inc3
-rw-r--r--meta/recipes-devtools/gcc/libgcc-common.inc1
3 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-4.8.inc b/meta/recipes-devtools/gcc/gcc-4.8.inc
index c32060034e..855ec26aef 100644
--- a/meta/recipes-devtools/gcc/gcc-4.8.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.8.inc
@@ -71,7 +71,6 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
71 file://0048-PR58854_fix_arm_apcs_epilogue.patch \ 71 file://0048-PR58854_fix_arm_apcs_epilogue.patch \
72 file://0049-Enable-SPE-AltiVec-generation-on-powepc-linux-target.patch \ 72 file://0049-Enable-SPE-AltiVec-generation-on-powepc-linux-target.patch \
73 file://0050-PR-target-58595.patch \ 73 file://0050-PR-target-58595.patch \
74 file://0051-fix-unwind-race.patch \
75 " 74 "
76SRC_URI[md5sum] = "a3d7d63b9cb6b6ea049469a0c4a43c9d" 75SRC_URI[md5sum] = "a3d7d63b9cb6b6ea049469a0c4a43c9d"
77SRC_URI[sha256sum] = "09dc2276c73424bbbfda1dbddc62bbbf900c9f185acf7f3e1d773ce2d7e3cdc8" 76SRC_URI[sha256sum] = "09dc2276c73424bbbfda1dbddc62bbbf900c9f185acf7f3e1d773ce2d7e3cdc8"
diff --git a/meta/recipes-devtools/gcc/gcc-cross.inc b/meta/recipes-devtools/gcc/gcc-cross.inc
index 165230b15f..27ebcf6485 100644
--- a/meta/recipes-devtools/gcc/gcc-cross.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross.inc
@@ -41,7 +41,7 @@ do_compile () {
41 export CXXFLAGS_FOR_TARGET="${TARGET_CXXFLAGS}" 41 export CXXFLAGS_FOR_TARGET="${TARGET_CXXFLAGS}"
42 export LDFLAGS_FOR_TARGET="${TARGET_LDFLAGS}" 42 export LDFLAGS_FOR_TARGET="${TARGET_LDFLAGS}"
43 43
44 oe_runmake all-host all-target-libgcc 44 oe_runmake all-host configure-target-libgcc
45 # now generate script to drive testing 45 # now generate script to drive testing
46 echo "#!/usr/bin/env sh" >${B}/${TARGET_PREFIX}testgcc 46 echo "#!/usr/bin/env sh" >${B}/${TARGET_PREFIX}testgcc
47 set >> ${B}/${TARGET_PREFIX}testgcc 47 set >> ${B}/${TARGET_PREFIX}testgcc
@@ -141,6 +141,7 @@ INHIBIT_PACKAGE_STRIP = "1"
141BINRELPATH = "${@os.path.relpath(d.expand("${STAGING_DIR_NATIVE}${prefix_native}/bin/${MULTIMACH_TARGET_SYS}"), d.expand("${libexecdir}/gcc/${TARGET_SYS}/${BINV}"))}" 141BINRELPATH = "${@os.path.relpath(d.expand("${STAGING_DIR_NATIVE}${prefix_native}/bin/${MULTIMACH_TARGET_SYS}"), d.expand("${libexecdir}/gcc/${TARGET_SYS}/${BINV}"))}"
142 142
143do_install () { 143do_install () {
144 ( cd ${B}/${TARGET_SYS}/libgcc; oe_runmake 'DESTDIR=${D}' install-unwind_h )
144 oe_runmake 'DESTDIR=${D}' install-host 145 oe_runmake 'DESTDIR=${D}' install-host
145 146
146 install -d ${D}${target_base_libdir} 147 install -d ${D}${target_base_libdir}
diff --git a/meta/recipes-devtools/gcc/libgcc-common.inc b/meta/recipes-devtools/gcc/libgcc-common.inc
index c4ab885cc3..b30bcfeaeb 100644
--- a/meta/recipes-devtools/gcc/libgcc-common.inc
+++ b/meta/recipes-devtools/gcc/libgcc-common.inc
@@ -7,6 +7,7 @@ do_configure () {
7 install -d ${D}${base_libdir} ${D}${libdir} 7 install -d ${D}${base_libdir} ${D}${libdir}
8 hardlinkdir ${STAGING_INCDIR_NATIVE}/${LIBGCCBUILDTREENAME}$target/ ${B} 8 hardlinkdir ${STAGING_INCDIR_NATIVE}/${LIBGCCBUILDTREENAME}$target/ ${B}
9 mkdir -p ${B}/${BPN} 9 mkdir -p ${B}/${BPN}
10 mkdir -p ${B}/$target/${BPN}/
10 cd ${B}/${BPN} 11 cd ${B}/${BPN}
11 chmod a+x ${S}/${BPN}/configure 12 chmod a+x ${S}/${BPN}/configure
12 ${S}/${BPN}/configure ${CONFIGUREOPTS} ${EXTRA_OECONF} 13 ${S}/${BPN}/configure ${CONFIGUREOPTS} ${EXTRA_OECONF}