From aa31bcbbc0331948a1037cd2d09c1a900753becc Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 8 Jul 2012 11:34:52 -0700 Subject: gcc: Convert do_headerfix into a definitive patch do_headerfix task is essentially editing configuration headers in sources which can well be maintained as a patch which is easier to spot errors (if any) than dynamically edited source tree (From OE-Core rev: ddd344e9acef88d614473581266569ce14716ccc) Signed-off-by: Khem Raj Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-devtools/gcc/gcc-common.inc | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'meta/recipes-devtools/gcc/gcc-common.inc') diff --git a/meta/recipes-devtools/gcc/gcc-common.inc b/meta/recipes-devtools/gcc/gcc-common.inc index 0a9324aa3c..72180db2a8 100644 --- a/meta/recipes-devtools/gcc/gcc-common.inc +++ b/meta/recipes-devtools/gcc/gcc-common.inc @@ -62,7 +62,6 @@ B = "${WORKDIR}/gcc-${PV}/build.${HOST_SYS}.${TARGET_SYS}" SS = "${TMPDIR}/stamps/work-shared/gcc-${PV}-${PR}" do_fetch[stamp-base] = "${SS}" do_unpack[stamp-base] = "${SS}" -do_headerfix[stamp-base] = "${SS}" do_patch[stamp-base] = "${SS}" # SW means Shared Work directory @@ -91,23 +90,6 @@ python workshared_clean () { oe.path.remove(dir) } -do_headerfix () { - # Change the default dynamic linker path, in case $base_liddir is non-standard - # (e.g. in multilib or sdk cases) - # - # We want something like the following: - # #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" - # becomes - # #define GLIBC_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld-linux-x86-64.so.2" - # - sed -i ${S}/gcc/config/*/linux*.h -e \ - 's#\(GLIBC_DYNAMIC_LINKER[^ ]*\) \( *"/lib.*\)/\(.*\)#\1 SYSTEMLIBS_DIR "\3#' -} - -addtask headerfix after do_unpack before do_patch - -do_headerfix[vardepvalue] = "PATH" - # We need to ensure that for the shared work directory, the do_patch singatures match # The real WORKDIR location isn't a dependency for the shared workdir. src_patches[vardepsexclude] = "WORKDIR" -- cgit v1.2.3-54-g00ecf