diff options
author | Jackie Huang <jackie.huang@windriver.com> | 2014-12-08 01:08:03 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-31 10:19:02 +0000 |
commit | 484b928531e93180b2a7c30657ad32218556646a (patch) | |
tree | b54bc3514cec3fc87c9a122c99646906cfe6bebe | |
parent | 0fb10cf6597a33faa9d335bff5c60abed2c660a1 (diff) | |
download | poky-484b928531e93180b2a7c30657ad32218556646a.tar.gz |
apr: avoid absolute paths for grep
The apr provides usr/share/build-1/libtool which is required by
the recipe such as apache2, and it will find grep on the host
and set absolute paths in libtool: GREP="/usr/bin/grep"
If we build apr/apr-native on a host that grep is in "/usr/bin/grep",
and re-use the sstate on another host with "/bin/grep", it will fail
when build apache2/apache2-native with:
| tmp/sysroots/x86_64-linux/usr/share/build-1/libtool: line 1093: /usr/bin/grep: No such file or directory
| tmp/sysroots/intel-x86-64/usr/share/build-1/libtool: line 1093: /usr/bin/grep: No such file or directory
(From OE-Core rev: 475709fc4f32e1ed01f45ee44819cd24e739eb43)
(From OE-Core rev: bbfa5c57ee97a96acf0b280ce342a515744b89a2)
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-support/apr/apr_1.5.1.bb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/meta/recipes-support/apr/apr_1.5.1.bb b/meta/recipes-support/apr/apr_1.5.1.bb index 49a08b0261..a27b2338d1 100644 --- a/meta/recipes-support/apr/apr_1.5.1.bb +++ b/meta/recipes-support/apr/apr_1.5.1.bb | |||
@@ -32,6 +32,11 @@ CACHED_CONFIGUREVARS += "apr_cv_mutex_recursive=yes" | |||
32 | CACHED_CONFIGUREVARS += "ac_cv_header_netinet_sctp_h=no ac_cv_header_netinet_sctp_uio_h=no" | 32 | CACHED_CONFIGUREVARS += "ac_cv_header_netinet_sctp_h=no ac_cv_header_netinet_sctp_uio_h=no" |
33 | 33 | ||
34 | do_configure_prepend() { | 34 | do_configure_prepend() { |
35 | # Avoid absolute paths for grep since it causes failures | ||
36 | # when using sstate between different hosts with different | ||
37 | # install paths for grep. | ||
38 | export GREP="grep" | ||
39 | |||
35 | cd ${S} | 40 | cd ${S} |
36 | ./buildconf | 41 | ./buildconf |
37 | } | 42 | } |