diff options
author | Ross Burton <ross.burton@intel.com> | 2015-05-15 17:42:09 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-05-15 22:08:03 +0100 |
commit | 3f8a47bf032570073094dae247d329e0ee41ff0d (patch) | |
tree | 21845e663fda83948cb784cd7904f83d6d6aefcb /meta/recipes-devtools | |
parent | 226ba5c4eb9f3d3251b1f8b143d7de7352c72f70 (diff) | |
download | poky-3f8a47bf032570073094dae247d329e0ee41ff0d.tar.gz |
automake: simplify perl location forcing logic
Instead of letting configure find the host's perl and then use a complicated sed
to replace it at install time, simply pre-seed the configure logic with the path
we want to use.
(From OE-Core rev: 84a3978653a322583d413d795567fa431ac7c952)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/automake/automake_1.15.bb | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/meta/recipes-devtools/automake/automake_1.15.bb b/meta/recipes-devtools/automake/automake_1.15.bb index d5b6e9eba4..c33dc22679 100644 --- a/meta/recipes-devtools/automake/automake_1.15.bb +++ b/meta/recipes-devtools/automake/automake_1.15.bb | |||
@@ -25,18 +25,10 @@ SRC_URI += " file://python-libdir.patch \ | |||
25 | SRC_URI[md5sum] = "716946a105ca228ab545fc37a70df3a3" | 25 | SRC_URI[md5sum] = "716946a105ca228ab545fc37a70df3a3" |
26 | SRC_URI[sha256sum] = "7946e945a96e28152ba5a6beb0625ca715c6e32ac55f2e353ef54def0c8ed924" | 26 | SRC_URI[sha256sum] = "7946e945a96e28152ba5a6beb0625ca715c6e32ac55f2e353ef54def0c8ed924" |
27 | 27 | ||
28 | CACHED_CONFIGUREVARS += "ac_cv_path_PERL=${USRBINPATH}/perl" | ||
29 | |||
28 | do_install_append () { | 30 | do_install_append () { |
29 | install -d ${D}${datadir} | 31 | install -d ${D}${datadir} |
30 | |||
31 | # Some distros have both /bin/perl and /usr/bin/perl, but we set perl location | ||
32 | # for target as /usr/bin/perl, so fix it to /usr/bin/perl. | ||
33 | for i in aclocal aclocal-${NAMEVER} automake automake-${NAMEVER}; do | ||
34 | if [ -f ${D}${bindir}/$i ]; then | ||
35 | sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/perl,' \ | ||
36 | -e 's,exec .*/bin/perl \(.*\) exec .*/bin/perl \(.*\),exec ${USRBINPATH}/perl \1 exec ${USRBINPATH}/perl \2,' \ | ||
37 | ${D}${bindir}/$i | ||
38 | fi | ||
39 | done | ||
40 | } | 32 | } |
41 | 33 | ||
42 | BBCLASSEXTEND = "native nativesdk" | 34 | BBCLASSEXTEND = "native nativesdk" |