diff options
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/autoconf/autoconf.inc | 8 | ||||
-rw-r--r-- | meta/recipes-devtools/automake/automake_1.12.1.bb | 8 | ||||
-rw-r--r-- | meta/recipes-devtools/quilt/quilt_0.60.bb | 5 |
3 files changed, 5 insertions, 16 deletions
diff --git a/meta/recipes-devtools/autoconf/autoconf.inc b/meta/recipes-devtools/autoconf/autoconf.inc index 3ae98c8407..2c077011f8 100644 --- a/meta/recipes-devtools/autoconf/autoconf.inc +++ b/meta/recipes-devtools/autoconf/autoconf.inc | |||
@@ -17,10 +17,6 @@ SRC_URI = "${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.bz2 \ | |||
17 | 17 | ||
18 | inherit autotools | 18 | inherit autotools |
19 | 19 | ||
20 | PERLPATH = "${bindir}/perl" | ||
21 | PERLPATH_virtclass-native = "/usr/bin/perl" | ||
22 | PERLPATH_virtclass-nativesdk = "/usr/bin/perl" | ||
23 | |||
24 | do_install_append() { | 20 | do_install_append() { |
25 | rm -rf ${D}${datadir}/emacs | 21 | rm -rf ${D}${datadir}/emacs |
26 | 22 | ||
@@ -28,8 +24,8 @@ do_install_append() { | |||
28 | # for target as /usr/bin/perl, so fix it to /usr/bin/perl. | 24 | # for target as /usr/bin/perl, so fix it to /usr/bin/perl. |
29 | for i in autoheader autom4te autoreconf autoscan autoupdate ifnames; do | 25 | for i in autoheader autom4te autoreconf autoscan autoupdate ifnames; do |
30 | if [ -f ${D}${bindir}/$i ]; then | 26 | if [ -f ${D}${bindir}/$i ]; then |
31 | sed -i -e '1s,#!.*perl,#! ${PERLPATH},' \ | 27 | sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/perl,' \ |
32 | -e 's,exec .*/bin/perl \(.*\) exec .*/bin/perl \(.*\),exec ${PERLPATH} \1 exec ${PERLPATH} \2,' \ | 28 | -e 's,exec .*/bin/perl \(.*\) exec .*/bin/perl \(.*\),exec ${USRBINPATH}/perl \1 exec ${USRBINPATH}/perl \2,' \ |
33 | ${D}${bindir}/$i | 29 | ${D}${bindir}/$i |
34 | fi | 30 | fi |
35 | done | 31 | done |
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 |
diff --git a/meta/recipes-devtools/quilt/quilt_0.60.bb b/meta/recipes-devtools/quilt/quilt_0.60.bb index 89c3f84f39..d866032188 100644 --- a/meta/recipes-devtools/quilt/quilt_0.60.bb +++ b/meta/recipes-devtools/quilt/quilt_0.60.bb | |||
@@ -9,15 +9,12 @@ PR = "r1" | |||
9 | 9 | ||
10 | CACHED_CONFIGUREVARS += "ac_cv_path_BASH=${base_bindir}/bash" | 10 | CACHED_CONFIGUREVARS += "ac_cv_path_BASH=${base_bindir}/bash" |
11 | 11 | ||
12 | PERLPATH = "${bindir}/env perl" | ||
13 | PERLPATH_virtclass-nativesdk = "/usr/bin/env perl" | ||
14 | |||
15 | # fix build-distro specific perl path in the target perl scripts | 12 | # fix build-distro specific perl path in the target perl scripts |
16 | do_install_append() { | 13 | do_install_append() { |
17 | for perlscript in ${D}${datadir}/quilt/scripts/remove-trailing-ws ${D}${datadir}/quilt/scripts/dependency-graph ${D}${datadir}/quilt/scripts/edmail ${D}${bindir}/guards | 14 | for perlscript in ${D}${datadir}/quilt/scripts/remove-trailing-ws ${D}${datadir}/quilt/scripts/dependency-graph ${D}${datadir}/quilt/scripts/edmail ${D}${bindir}/guards |
18 | do | 15 | do |
19 | if [ -f $perlscript ]; then | 16 | if [ -f $perlscript ]; then |
20 | sed -i -e '1s,#!.*perl,#! ${PERLPATH},' $perlscript | 17 | sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' $perlscript |
21 | fi | 18 | fi |
22 | done | 19 | done |
23 | } | 20 | } |