diff options
Diffstat (limited to 'meta/recipes-devtools/automake')
| -rw-r--r-- | meta/recipes-devtools/automake/automake_1.12.1.bb | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/meta/recipes-devtools/automake/automake_1.12.1.bb b/meta/recipes-devtools/automake/automake_1.12.1.bb index c2bc6a3068..a1e37d471c 100644 --- a/meta/recipes-devtools/automake/automake_1.12.1.bb +++ b/meta/recipes-devtools/automake/automake_1.12.1.bb | |||
| @@ -34,10 +34,6 @@ PATHFIXPATCH = "file://path_prog_fixes.patch" | |||
| 34 | PATHFIXPATCH_virtclass-native = "" | 34 | PATHFIXPATCH_virtclass-native = "" |
| 35 | PATHFIXPATCH_virtclass-nativesdk = "" | 35 | PATHFIXPATCH_virtclass-nativesdk = "" |
| 36 | 36 | ||
| 37 | PERLPATH = "${bindir}/perl" | ||
| 38 | PERLPATH_virtclass-native = "/usr/bin/perl" | ||
| 39 | PERLPATH_virtclass-nativesdk = "/usr/bin/perl" | ||
| 40 | |||
| 41 | SRC_URI += "${PATHFIXPATCH} \ | 37 | SRC_URI += "${PATHFIXPATCH} \ |
| 42 | file://prefer-cpio-over-pax-for-ustar-archives.patch \ | 38 | file://prefer-cpio-over-pax-for-ustar-archives.patch \ |
| 43 | file://python-libdir.patch \ | 39 | file://python-libdir.patch \ |
| @@ -56,8 +52,8 @@ do_install () { | |||
| 56 | # for target as /usr/bin/perl, so fix it to /usr/bin/perl. | 52 | # for target as /usr/bin/perl, so fix it to /usr/bin/perl. |
| 57 | for i in aclocal aclocal-1.11 automake automake-1.11; do | 53 | for i in aclocal aclocal-1.11 automake automake-1.11; do |
| 58 | if [ -f ${D}${bindir}/$i ]; then | 54 | if [ -f ${D}${bindir}/$i ]; then |
| 59 | sed -i -e '1s,#!.*perl,#! ${PERLPATH},' \ | 55 | sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/perl,' \ |
| 60 | -e 's,exec .*/bin/perl \(.*\) exec .*/bin/perl \(.*\),exec ${PERLPATH} \1 exec ${PERLPATH} \2,' \ | 56 | -e 's,exec .*/bin/perl \(.*\) exec .*/bin/perl \(.*\),exec ${USRBINPATH}/perl \1 exec ${USRBINPATH}/perl \2,' \ |
| 61 | ${D}${bindir}/$i | 57 | ${D}${bindir}/$i |
| 62 | fi | 58 | fi |
| 63 | done | 59 | done |
