mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 00:20:08 +00:00
Code Issues Projects Releases Wiki Activity

automake: unhardcode version number

Browse Source 
Use trim_version to get version part of the executable name.

(From OE-Core rev: af0f93059510fb4ccbe7b1497bda8dd8370245a5)

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Marko Lindqvist
2013-10-10 02:29:52 +03:00
committed by Richard Purdie
parent 79939e4207
commit e604aee52f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-devtools/automake/automake_1.12.6.bb
+3 -3
View File
@@ -3,6 +3,8 @@ LICENSE="GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
DEPENDS_class-native = "autoconf-native" DEPENDS_class-native = "autoconf-native"
NAMEVER = "${@oe.utils.trim_version("${PV}", 2)}"
RDEPENDS_${PN} += "\ RDEPENDS_${PN} += "\
autoconf \ autoconf \
perl \ perl \
@@ -29,14 +31,12 @@ SRC_URI += "${PATHFIXPATCH} \
SRC_URI[md5sum] = "199d39ece2e6070d64ac20d45ac86026" SRC_URI[md5sum] = "199d39ece2e6070d64ac20d45ac86026"
SRC_URI[sha256sum] = "0cbe570db487908e70af7119da85ba04f7e28656b26f717df0265ae08defd9ef" SRC_URI[sha256sum] = "0cbe570db487908e70af7119da85ba04f7e28656b26f717df0265ae08defd9ef"
PR = "r0"
do_install_append () { do_install_append () {
install -d ${D}${datadir} install -d ${D}${datadir}
# Some distros have both /bin/perl and /usr/bin/perl, but we set perl location # 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 target as /usr/bin/perl, so fix it to /usr/bin/perl.
for i in aclocal aclocal-1.12 automake automake-1.12; do for i in aclocal aclocal-${NAMEVER} automake automake-${NAMEVER}; do
if [ -f ${D}${bindir}/$i ]; then if [ -f ${D}${bindir}/$i ]; then
sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/perl,' \ sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/perl,' \
-e 's,exec .*/bin/perl \(.*\) exec .*/bin/perl \(.*\),exec ${USRBINPATH}/perl \1 exec ${USRBINPATH}/perl \2,' \ -e 's,exec .*/bin/perl \(.*\) exec .*/bin/perl \(.*\),exec ${USRBINPATH}/perl \1 exec ${USRBINPATH}/perl \2,' \