diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2012-04-16 17:15:58 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-04-16 22:52:39 +0100 |
commit | 393908e53b243b16ab984da7f073be371e062946 (patch) | |
tree | bf5a48a9321b647c2493741e3b524857a8dbf064 | |
parent | 13e6e316d751d0ea3107d5547f6bdd2b74919cad (diff) | |
download | openembedded-core-393908e53b243b16ab984da7f073be371e062946.tar.gz openembedded-core-393908e53b243b16ab984da7f073be371e062946.tar.bz2 openembedded-core-393908e53b243b16ab984da7f073be371e062946.tar.xz openembedded-core-393908e53b243b16ab984da7f073be371e062946.zip |
autoconf-nativesdk: fix builds on fedora 17
Generally distros keep perl at /usr/bin/perl
Fedora 17 also has /bin/perl
this causes autoconf-nativesdk build on such distros to put perl
interpreter path in the perl scripts as /bin/perl
But we set perl location for target as /usr/bin/perl
This mismatch of perl path causes failure of rootfs image creation
like this:
| error: Failed dependencies:
| /bin/perl is needed by autoconf-nativesdk-2.68-r6.x86_64.rpm
NOTE: package meta-toolchain-gmae-1.0-r7: task do_populate_sdk: Failed
The second sed command is for such a case:
eval 'case $# in 0) exec /bin/perl -S "$0";; *) exec /bin/perl -S "$0" "$@";; esac'
This line has two "/bin/perl" and we can't use a line number to tell
sed which line it is since the line numbers in different files are
defferent.
[YOCTO #2304]
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
-rw-r--r-- | meta/recipes-devtools/autoconf/autoconf.inc | 16 | ||||
-rw-r--r-- | meta/recipes-devtools/autoconf/autoconf_2.68.bb | 2 |
2 files changed, 16 insertions, 2 deletions
diff --git a/meta/recipes-devtools/autoconf/autoconf.inc b/meta/recipes-devtools/autoconf/autoconf.inc index 80a5d9291..3ae98c840 100644 --- a/meta/recipes-devtools/autoconf/autoconf.inc +++ b/meta/recipes-devtools/autoconf/autoconf.inc @@ -17,6 +17,20 @@ SRC_URI = "${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.bz2 \ inherit autotools +PERLPATH = "${bindir}/perl" +PERLPATH_virtclass-native = "/usr/bin/perl" +PERLPATH_virtclass-nativesdk = "/usr/bin/perl" + do_install_append() { - rm -rf ${D}${datadir}/emacs + rm -rf ${D}${datadir}/emacs + + # 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 autoheader autom4te autoreconf autoscan autoupdate ifnames; do + if [ -f ${D}${bindir}/$i ]; then + sed -i -e '1s,#!.*perl,#! ${PERLPATH},' \ + -e 's,exec .*/bin/perl \(.*\) exec .*/bin/perl \(.*\),exec ${PERLPATH} \1 exec ${PERLPATH} \2,' \ + ${D}${bindir}/$i + fi + done } diff --git a/meta/recipes-devtools/autoconf/autoconf_2.68.bb b/meta/recipes-devtools/autoconf/autoconf_2.68.bb index f1b506a94..8d466e09f 100644 --- a/meta/recipes-devtools/autoconf/autoconf_2.68.bb +++ b/meta/recipes-devtools/autoconf/autoconf_2.68.bb @@ -1,6 +1,6 @@ require autoconf.inc -PR = "r6" +PR = "r7" PARALLEL_MAKE = "" |