diff options
author | Khem Raj <raj.khem@gmail.com> | 2012-07-08 11:34:52 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-07-17 10:54:01 +0100 |
commit | aa31bcbbc0331948a1037cd2d09c1a900753becc (patch) | |
tree | 65d80f49d6540446b64cd1f747ea8f2df961b6b3 /meta/recipes-devtools/gcc/gcc-common.inc | |
parent | 804cebc8b9329523c31bb864d7049f8dc5279a5c (diff) | |
download | poky-aa31bcbbc0331948a1037cd2d09c1a900753becc.tar.gz |
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 <raj.khem@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/gcc/gcc-common.inc')
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-common.inc | 18 |
1 files changed, 0 insertions, 18 deletions
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}" | |||
62 | SS = "${TMPDIR}/stamps/work-shared/gcc-${PV}-${PR}" | 62 | SS = "${TMPDIR}/stamps/work-shared/gcc-${PV}-${PR}" |
63 | do_fetch[stamp-base] = "${SS}" | 63 | do_fetch[stamp-base] = "${SS}" |
64 | do_unpack[stamp-base] = "${SS}" | 64 | do_unpack[stamp-base] = "${SS}" |
65 | do_headerfix[stamp-base] = "${SS}" | ||
66 | do_patch[stamp-base] = "${SS}" | 65 | do_patch[stamp-base] = "${SS}" |
67 | 66 | ||
68 | # SW means Shared Work directory | 67 | # SW means Shared Work directory |
@@ -91,23 +90,6 @@ python workshared_clean () { | |||
91 | oe.path.remove(dir) | 90 | oe.path.remove(dir) |
92 | } | 91 | } |
93 | 92 | ||
94 | do_headerfix () { | ||
95 | # Change the default dynamic linker path, in case $base_liddir is non-standard | ||
96 | # (e.g. in multilib or sdk cases) | ||
97 | # | ||
98 | # We want something like the following: | ||
99 | # #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" | ||
100 | # becomes | ||
101 | # #define GLIBC_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld-linux-x86-64.so.2" | ||
102 | # | ||
103 | sed -i ${S}/gcc/config/*/linux*.h -e \ | ||
104 | 's#\(GLIBC_DYNAMIC_LINKER[^ ]*\) \( *"/lib.*\)/\(.*\)#\1 SYSTEMLIBS_DIR "\3#' | ||
105 | } | ||
106 | |||
107 | addtask headerfix after do_unpack before do_patch | ||
108 | |||
109 | do_headerfix[vardepvalue] = "PATH" | ||
110 | |||
111 | # We need to ensure that for the shared work directory, the do_patch singatures match | 93 | # We need to ensure that for the shared work directory, the do_patch singatures match |
112 | # The real WORKDIR location isn't a dependency for the shared workdir. | 94 | # The real WORKDIR location isn't a dependency for the shared workdir. |
113 | src_patches[vardepsexclude] = "WORKDIR" | 95 | src_patches[vardepsexclude] = "WORKDIR" |