diff options
Diffstat (limited to 'meta/recipes-devtools/gcc/gcc-common.inc')
| -rw-r--r-- | meta/recipes-devtools/gcc/gcc-common.inc | 51 |
1 files changed, 1 insertions, 50 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-common.inc b/meta/recipes-devtools/gcc/gcc-common.inc index 9d41f651ed..04c701a974 100644 --- a/meta/recipes-devtools/gcc/gcc-common.inc +++ b/meta/recipes-devtools/gcc/gcc-common.inc @@ -79,19 +79,6 @@ ${GNU_MIRROR}/gcc http://mirrors.rcn.net/pub/sourceware/gcc/releases/ \n \ ${GNU_MIRROR}/gcc http://gcc.get-software.com/releases/ \n \ ${GNU_MIRROR}/gcc http://gcc.get-software.com/releases/ \n \ " - -python do_preconfigure () { - import subprocess - cmd = d.expand('PATH=${PATH} cd ${S} && gnu-configize') - subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True) - # See 0044-gengtypes.patch, we need to regenerate this file - bb.utils.remove(d.expand("${S}/gcc/gengtype-lex.c")) - cmd = d.expand("sed -i 's/BUILD_INFO=info/BUILD_INFO=/' ${S}/gcc/configure") - subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True) -} -addtask do_preconfigure after do_patch before do_configure -do_preconfigure[depends] += "gnu-config-native:do_populate_sysroot autoconf-native:do_populate_sysroot" - # # Set some default values # @@ -101,48 +88,12 @@ BINV = "${PV}" S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV}" B = "${WORKDIR}/gcc-${PV}/build.${HOST_SYS}.${TARGET_SYS}" -# SS means Shared Stamps directory -SS = "${TMPDIR}/stamps/work-shared/gcc-${PV}-${PR}" -do_fetch[stamp-base] = "${SS}" -do_unpack[stamp-base] = "${SS}" -do_patch[stamp-base] = "${SS}" -do_preconfigure[stamp-base] = "${SS}" -SSCLEAN = "${TMPDIR}/stamps/work-shared/gcc-[0-9]*-*" -do_fetch[stamp-base-clean] = "${SSCLEAN}" -do_unpack[stamp-base-clean] = "${SSCLEAN}" -do_unpack[umask] = "022" -do_patch[stamp-base-clean] = "${SSCLEAN}" -do_preconfigure[stamp-base-clean] = "${SSCLEAN}" - -# SW means Shared Work directory -SW = "${TMPDIR}/work-shared/gcc-${PV}-${PR}" -SSTATE_SWSPEC = "sstate:gcc::${PV}:${PR}::${SSTATE_VERSION}:" -WORKDIR_task-unpack = "${SW}" -WORKDIR_task-patch = "${SW}" -WORKDIR_task-preconfigure = "${SW}" - target_includedir ?= "${includedir}" target_libdir ?= "${libdir}" target_base_libdir ?= "${base_libdir}" target_prefix ?= "${prefix}" -CLEANFUNCS += "workshared_clean" -# The do_clean should be exclusive since share ${S} -do_clean[lockfiles] = "${SW}.clean.lock" - -python workshared_clean () { - """clear the source directory""" - dir = d.expand("${SW}") - bb.note("Removing " + dir) - oe.path.remove(dir) - - """clear the the stamps in work-shared""" - dir = "%s.*" % bb.data.expand(d.getVarFlag('do_fetch', 'stamp-base', True), d) - bb.note("Removing " + dir) - oe.path.remove(dir) -} - -# We need to ensure that for the shared work directory, the do_patch singatures match +# We need to ensure that for the shared work directory, the do_patch signatures match # The real WORKDIR location isn't a dependency for the shared workdir. src_patches[vardepsexclude] = "WORKDIR" should_apply[vardepsexclude] += "PN" |