summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/gcc
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-04-27 01:23:07 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-04-30 16:39:06 +0100
commite078edbf99f733c04ec8ca50ff10d2200b6d14d4 (patch)
tree627f73b4257adf3202d4302090c9e11ce3895807 /meta/recipes-devtools/gcc
parent03a0f8e8b4e286bfcc0076e7380ce26d1b1b106a (diff)
downloadpoky-e078edbf99f733c04ec8ca50ff10d2200b6d14d4.tar.gz
binutils/gcc/gdb: Add TARGET_ARCH to PN for all cross recipes
This allows them to co-exist together in the native sysroot, with one set of cross tools per target architecture. (From OE-Core rev: a2c5509520d5c3e082f55844e6545d0309565f8f) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/gcc')
-rw-r--r--meta/recipes-devtools/gcc/gcc-common.inc2
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross-canadian.inc1
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross-initial.inc6
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross.inc8
-rw-r--r--meta/recipes-devtools/gcc/gcc-crosssdk-initial.inc2
-rw-r--r--meta/recipes-devtools/gcc/gcc-crosssdk.inc2
-rw-r--r--meta/recipes-devtools/gcc/gcc-runtime.inc2
-rw-r--r--meta/recipes-devtools/gcc/libgcc-common.inc2
-rw-r--r--meta/recipes-devtools/gcc/libgcc-initial.inc4
-rw-r--r--meta/recipes-devtools/gcc/libgfortran.inc2
10 files changed, 20 insertions, 11 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-common.inc b/meta/recipes-devtools/gcc/gcc-common.inc
index 1e00249b19..a96bcaa92c 100644
--- a/meta/recipes-devtools/gcc/gcc-common.inc
+++ b/meta/recipes-devtools/gcc/gcc-common.inc
@@ -7,6 +7,8 @@ NATIVEDEPS = ""
7 7
8inherit autotools gettext 8inherit autotools gettext
9 9
10BPN = "gcc"
11
10def get_gcc_fpu_setting(bb, d): 12def get_gcc_fpu_setting(bb, d):
11 if d.getVar('ARMPKGSFX_EABI', True) == "hf" and d.getVar('TRANSLATED_TARGET_ARCH', True) == "arm": 13 if d.getVar('ARMPKGSFX_EABI', True) == "hf" and d.getVar('TRANSLATED_TARGET_ARCH', True) == "arm":
12 return "--with-float=hard" 14 return "--with-float=hard"
diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
index 8d979b1144..307f73c8ed 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
@@ -2,7 +2,6 @@ inherit cross-canadian
2 2
3SUMMARY = "GNU cc and gcc C compilers (cross-canadian for ${TARGET_ARCH} target)" 3SUMMARY = "GNU cc and gcc C compilers (cross-canadian for ${TARGET_ARCH} target)"
4PN = "gcc-cross-canadian-${TRANSLATED_TARGET_ARCH}" 4PN = "gcc-cross-canadian-${TRANSLATED_TARGET_ARCH}"
5BPN = "gcc"
6 5
7DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${HOST_PREFIX}binutils-crosssdk virtual/nativesdk-${HOST_PREFIX}libc-for-gcc nativesdk-gettext" 6DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${HOST_PREFIX}binutils-crosssdk virtual/nativesdk-${HOST_PREFIX}libc-for-gcc nativesdk-gettext"
8 7
diff --git a/meta/recipes-devtools/gcc/gcc-cross-initial.inc b/meta/recipes-devtools/gcc/gcc-cross-initial.inc
index 897e055cf3..5a6da8bbd2 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-initial.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross-initial.inc
@@ -5,6 +5,8 @@ PACKAGES = ""
5INHIBIT_AUTOTOOLS_DEPS = "1" 5INHIBIT_AUTOTOOLS_DEPS = "1"
6INHIBIT_DEFAULT_DEPS = "1" 6INHIBIT_DEFAULT_DEPS = "1"
7 7
8PN = "gcc-cross-initial-${TARGET_ARCH}"
9
8CROSS_TARGET_SYS_DIR_append = ".${PN}" 10CROSS_TARGET_SYS_DIR_append = ".${PN}"
9 11
10# This is intended to be a -very- basic config 12# This is intended to be a -very- basic config
@@ -68,8 +70,8 @@ do_install () {
68 70
69 # gcc-runtime installs libgcc into a special location in staging since it breaks doing a standalone build 71 # gcc-runtime installs libgcc into a special location in staging since it breaks doing a standalone build
70 case ${PN} in 72 case ${PN} in
71 *gcc-cross-initial|*gcc-crosssdk-initial) 73 *gcc-cross-initial-${TARGET_ARCH}|*gcc-crosssdk-initial-${TARGET_ARCH})
72 dest=${D}/${includedir}/gcc-build-internal-initial-${MULTIMACH_TARGET_SYS} 74 dest=${D}/${includedir}/gcc-build-internal-initial-${TARGET_SYS}
73 hardlinkdir . $dest 75 hardlinkdir . $dest
74 ;; 76 ;;
75 esac 77 esac
diff --git a/meta/recipes-devtools/gcc/gcc-cross.inc b/meta/recipes-devtools/gcc/gcc-cross.inc
index 27ebcf6485..ef88d3f49c 100644
--- a/meta/recipes-devtools/gcc/gcc-cross.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross.inc
@@ -9,6 +9,8 @@ python () {
9 d.setVar("EXTRADEPENDS", "linux-libc-headers") 9 d.setVar("EXTRADEPENDS", "linux-libc-headers")
10} 10}
11 11
12PN = "gcc-cross-${TARGET_ARCH}"
13
12require gcc-configure-common.inc 14require gcc-configure-common.inc
13 15
14EXTRA_OECONF += " --enable-poison-system-directories" 16EXTRA_OECONF += " --enable-poison-system-directories"
@@ -138,7 +140,7 @@ STOP
138INHIBIT_PACKAGE_STRIP = "1" 140INHIBIT_PACKAGE_STRIP = "1"
139 141
140# Compute how to get from libexecdir to bindir in python (easier than shell) 142# Compute how to get from libexecdir to bindir in python (easier than shell)
141BINRELPATH = "${@os.path.relpath(d.expand("${STAGING_DIR_NATIVE}${prefix_native}/bin/${MULTIMACH_TARGET_SYS}"), d.expand("${libexecdir}/gcc/${TARGET_SYS}/${BINV}"))}" 143BINRELPATH = "${@os.path.relpath(d.expand("${STAGING_DIR_NATIVE}${prefix_native}/bin/${TARGET_SYS}"), d.expand("${libexecdir}/gcc/${TARGET_SYS}/${BINV}"))}"
142 144
143do_install () { 145do_install () {
144 ( cd ${B}/${TARGET_SYS}/libgcc; oe_runmake 'DESTDIR=${D}' install-unwind_h ) 146 ( cd ${B}/${TARGET_SYS}/libgcc; oe_runmake 'DESTDIR=${D}' install-unwind_h )
@@ -177,8 +179,8 @@ do_install () {
177 179
178 # gcc-runtime installs libgcc into a special location in staging since it breaks doing a standalone build 180 # gcc-runtime installs libgcc into a special location in staging since it breaks doing a standalone build
179 case ${PN} in 181 case ${PN} in
180 *gcc-cross|*gcc-crosssdk) 182 *gcc-cross-${TARGET_ARCH}|*gcc-crosssdk-${TARGET_ARCH})
181 dest=${D}/${includedir}/gcc-build-internal-${MULTIMACH_TARGET_SYS} 183 dest=${D}/${includedir}/gcc-build-internal-${TARGET_SYS}
182 hardlinkdir . $dest 184 hardlinkdir . $dest
183 ;; 185 ;;
184 esac 186 esac
diff --git a/meta/recipes-devtools/gcc/gcc-crosssdk-initial.inc b/meta/recipes-devtools/gcc/gcc-crosssdk-initial.inc
index c6f74a6445..7d2599cb6c 100644
--- a/meta/recipes-devtools/gcc/gcc-crosssdk-initial.inc
+++ b/meta/recipes-devtools/gcc/gcc-crosssdk-initial.inc
@@ -1,5 +1,7 @@
1inherit crosssdk 1inherit crosssdk
2 2
3PN = "gcc-crosssdk-initial-${TARGET_ARCH}"
4
3SYSTEMHEADERS = "${SDKPATHNATIVE}${prefix_nativesdk}/include" 5SYSTEMHEADERS = "${SDKPATHNATIVE}${prefix_nativesdk}/include"
4SYSTEMLIBS = "${SDKPATHNATIVE}${base_libdir_nativesdk}/" 6SYSTEMLIBS = "${SDKPATHNATIVE}${base_libdir_nativesdk}/"
5SYSTEMLIBS1 = "${SDKPATHNATIVE}${libdir_nativesdk}/" 7SYSTEMLIBS1 = "${SDKPATHNATIVE}${libdir_nativesdk}/"
diff --git a/meta/recipes-devtools/gcc/gcc-crosssdk.inc b/meta/recipes-devtools/gcc/gcc-crosssdk.inc
index 5fe0b947dd..53f880f39b 100644
--- a/meta/recipes-devtools/gcc/gcc-crosssdk.inc
+++ b/meta/recipes-devtools/gcc/gcc-crosssdk.inc
@@ -1,5 +1,7 @@
1inherit crosssdk 1inherit crosssdk
2 2
3PN = "gcc-crosssdk-${TARGET_ARCH}"
4
3SYSTEMHEADERS = "${SDKPATHNATIVE}${prefix_nativesdk}/include" 5SYSTEMHEADERS = "${SDKPATHNATIVE}${prefix_nativesdk}/include"
4SYSTEMLIBS = "${SDKPATHNATIVE}${base_libdir_nativesdk}/" 6SYSTEMLIBS = "${SDKPATHNATIVE}${base_libdir_nativesdk}/"
5SYSTEMLIBS1 = "${SDKPATHNATIVE}${libdir_nativesdk}/" 7SYSTEMLIBS1 = "${SDKPATHNATIVE}${libdir_nativesdk}/"
diff --git a/meta/recipes-devtools/gcc/gcc-runtime.inc b/meta/recipes-devtools/gcc/gcc-runtime.inc
index 2e82a09b1c..5fd2a8c8b0 100644
--- a/meta/recipes-devtools/gcc/gcc-runtime.inc
+++ b/meta/recipes-devtools/gcc/gcc-runtime.inc
@@ -20,7 +20,7 @@ RUNTIMETARGET = "libssp libstdc++-v3 libgomp libatomic"
20 20
21do_configure () { 21do_configure () {
22 export CXX="${CXX} -nostdinc++ -nostdlib++" 22 export CXX="${CXX} -nostdinc++ -nostdlib++"
23 mtarget=`echo ${MULTIMACH_TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##` 23 mtarget=`echo ${TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##`
24 target=`echo ${TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##` 24 target=`echo ${TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##`
25 hardlinkdir ${STAGING_INCDIR_NATIVE}/gcc-build-internal-$mtarget ${B} 25 hardlinkdir ${STAGING_INCDIR_NATIVE}/gcc-build-internal-$mtarget ${B}
26 for d in libgcc ${RUNTIMETARGET}; do 26 for d in libgcc ${RUNTIMETARGET}; do
diff --git a/meta/recipes-devtools/gcc/libgcc-common.inc b/meta/recipes-devtools/gcc/libgcc-common.inc
index b30bcfeaeb..c81a80c6de 100644
--- a/meta/recipes-devtools/gcc/libgcc-common.inc
+++ b/meta/recipes-devtools/gcc/libgcc-common.inc
@@ -3,7 +3,7 @@ BPN = "libgcc"
3INHIBIT_DEFAULT_DEPS = "1" 3INHIBIT_DEFAULT_DEPS = "1"
4 4
5do_configure () { 5do_configure () {
6 target=`echo ${MULTIMACH_TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##` 6 target=`echo ${TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##`
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}
diff --git a/meta/recipes-devtools/gcc/libgcc-initial.inc b/meta/recipes-devtools/gcc/libgcc-initial.inc
index 2ba27a81d8..27e2e45aa6 100644
--- a/meta/recipes-devtools/gcc/libgcc-initial.inc
+++ b/meta/recipes-devtools/gcc/libgcc-initial.inc
@@ -2,8 +2,8 @@ require libgcc-common.inc
2 2
3DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial" 3DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial"
4 4
5STAGINGCC = "gcc-cross-initial" 5STAGINGCC = "gcc-cross-initial-${TARGET_ARCH}"
6STAGINGCC_class-nativesdk = "gcc-crosssdk-initial" 6STAGINGCC_class-nativesdk = "gcc-crosssdk-initial-${TARGET_ARCH}"
7PATH_prepend = "${STAGING_BINDIR_TOOLCHAIN}.${STAGINGCC}:" 7PATH_prepend = "${STAGING_BINDIR_TOOLCHAIN}.${STAGINGCC}:"
8 8
9PACKAGES = "" 9PACKAGES = ""
diff --git a/meta/recipes-devtools/gcc/libgfortran.inc b/meta/recipes-devtools/gcc/libgfortran.inc
index 30e5ffeead..7bf412134b 100644
--- a/meta/recipes-devtools/gcc/libgfortran.inc
+++ b/meta/recipes-devtools/gcc/libgfortran.inc
@@ -5,7 +5,7 @@ EXTRA_OECONF_PATHS = " \
5 --with-build-sysroot=${STAGING_DIR_TARGET}" 5 --with-build-sysroot=${STAGING_DIR_TARGET}"
6 6
7do_configure () { 7do_configure () {
8 mtarget=`echo ${MULTIMACH_TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##` 8 mtarget=`echo ${TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##`
9 target=`echo ${TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##` 9 target=`echo ${TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##`
10 hardlinkdir ${STAGING_INCDIR_NATIVE}/gcc-build-internal-$mtarget ${B} 10 hardlinkdir ${STAGING_INCDIR_NATIVE}/gcc-build-internal-$mtarget ${B}
11 11