summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarko Lindqvist <cazfi74@gmail.com>2013-10-10 02:29:52 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-10-14 16:55:32 +0100
commite604aee52fe4231d1bb968f828669d7cbc29db0d (patch)
tree83beb2e96e6421c345042c6e67e1dc77a713ae21
parent79939e4207a8d14ed9b27bfa8ec8391912254762 (diff)
downloadpoky-e604aee52fe4231d1bb968f828669d7cbc29db0d.tar.gz
automake: unhardcode version number
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>
-rw-r--r--meta/recipes-devtools/automake/automake_1.12.6.bb6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-devtools/automake/automake_1.12.6.bb b/meta/recipes-devtools/automake/automake_1.12.6.bb
index 549051bc7b..b65e5ae103 100644
--- a/meta/recipes-devtools/automake/automake_1.12.6.bb
+++ b/meta/recipes-devtools/automake/automake_1.12.6.bb
@@ -3,6 +3,8 @@ LICENSE="GPLv2"
3LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" 3LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
4DEPENDS_class-native = "autoconf-native" 4DEPENDS_class-native = "autoconf-native"
5 5
6NAMEVER = "${@oe.utils.trim_version("${PV}", 2)}"
7
6RDEPENDS_${PN} += "\ 8RDEPENDS_${PN} += "\
7 autoconf \ 9 autoconf \
8 perl \ 10 perl \
@@ -29,14 +31,12 @@ SRC_URI += "${PATHFIXPATCH} \
29SRC_URI[md5sum] = "199d39ece2e6070d64ac20d45ac86026" 31SRC_URI[md5sum] = "199d39ece2e6070d64ac20d45ac86026"
30SRC_URI[sha256sum] = "0cbe570db487908e70af7119da85ba04f7e28656b26f717df0265ae08defd9ef" 32SRC_URI[sha256sum] = "0cbe570db487908e70af7119da85ba04f7e28656b26f717df0265ae08defd9ef"
31 33
32PR = "r0"
33
34do_install_append () { 34do_install_append () {
35 install -d ${D}${datadir} 35 install -d ${D}${datadir}
36 36
37 # Some distros have both /bin/perl and /usr/bin/perl, but we set perl location 37 # Some distros have both /bin/perl and /usr/bin/perl, but we set perl location
38 # for target as /usr/bin/perl, so fix it to /usr/bin/perl. 38 # for target as /usr/bin/perl, so fix it to /usr/bin/perl.
39 for i in aclocal aclocal-1.12 automake automake-1.12; do 39 for i in aclocal aclocal-${NAMEVER} automake automake-${NAMEVER}; do
40 if [ -f ${D}${bindir}/$i ]; then 40 if [ -f ${D}${bindir}/$i ]; then
41 sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/perl,' \ 41 sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/perl,' \
42 -e 's,exec .*/bin/perl \(.*\) exec .*/bin/perl \(.*\),exec ${USRBINPATH}/perl \1 exec ${USRBINPATH}/perl \2,' \ 42 -e 's,exec .*/bin/perl \(.*\) exec .*/bin/perl \(.*\),exec ${USRBINPATH}/perl \1 exec ${USRBINPATH}/perl \2,' \