mirror of
https://git.yoctoproject.org/poky
synced 2026-04-04 14:02:22 +02:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
226ba5c4eb
commit
3f8a47bf03
@@ -25,18 +25,10 @@ SRC_URI += " file://python-libdir.patch \
|
||||
SRC_URI[md5sum] = "716946a105ca228ab545fc37a70df3a3"
|
||||
SRC_URI[sha256sum] = "7946e945a96e28152ba5a6beb0625ca715c6e32ac55f2e353ef54def0c8ed924"
|
||||
|
||||
CACHED_CONFIGUREVARS += "ac_cv_path_PERL=${USRBINPATH}/perl"
|
||||
|
||||
do_install_append () {
|
||||
install -d ${D}${datadir}
|
||||
|
||||
# Some distros have both /bin/perl and /usr/bin/perl, but we set perl location
|
||||
# for target as /usr/bin/perl, so fix it to /usr/bin/perl.
|
||||
for i in aclocal aclocal-${NAMEVER} automake automake-${NAMEVER}; do
|
||||
if [ -f ${D}${bindir}/$i ]; then
|
||||
sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/perl,' \
|
||||
-e 's,exec .*/bin/perl \(.*\) exec .*/bin/perl \(.*\),exec ${USRBINPATH}/perl \1 exec ${USRBINPATH}/perl \2,' \
|
||||
${D}${bindir}/$i
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
BBCLASSEXTEND = "native nativesdk"
|
||||
|
||||
Reference in New Issue
Block a user