From: "Song.Li" <[email protected]> Generally distros keep perl at /usr/bin/perl But Fedora 17 also has /bin/perl, this causes groff_1.20.1 build to put perl interpreter path 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 groff-1.20.1-r1.ppc603e Signed-off-by: Song.Li <[email protected]> Sync up with the do_install_append_virtclass-native chunk. Signed-off-by: Mark Hatle <[email protected]> Signed-off-by: Elizabeth Flanagan <[email protected]> Signed-off-by: Richard Purdie <[email protected]> --- meta/recipes-extended/groff/groff_1.20.1.bb | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/meta/recipes-extended/groff/groff_1.20.1.bb b/meta/recipes-extended/groff/groff_1.20.1.bb index 6cb72bf..ef22548 100644 --- a/meta/recipes-extended/groff/groff_1.20.1.bb +++ b/meta/recipes-extended/groff/groff_1.20.1.bb @@ -4,7 +4,7 @@ formatting commands and produces formatted output." SECTION = "base" HOMEPAGE = "ftp://ftp.gnu.org/gnu/groff/"; LICENSE = "GPLv2" -PR = "r1" +PR = "r2" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" @@ -18,6 +18,10 @@ DEPENDS_virtclass-native = "" inherit autotools +PERLPATH = "${bindir}/perl" +PERLPATH_virtclass-native = "/usr/bin/env perl" +PERLPATH_virtclass-nativesdk = "/usr/bin/env perl" + EXTRA_OECONF = "--without-x" PARALLEL_MAKE = "" @@ -34,7 +38,25 @@ do_configure_prepend() { fi } +do_install_append() { + # 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 afmtodit mmroff; do + if [ -f ${D}${bindir}/$i ]; then + sed -i -e '1s,#!.*perl,#! ${PERLPATH},' ${D}${bindir}/$i + fi + done +} + do_install_append_virtclass-native() { + # 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 afmtodit mmroff; do + if [ -f ${D}${bindir}/$i ]; then + sed -i -e '1s,#!.*perl,#! ${PERLPATH},' ${D}${bindir}/$i + fi + done + create_cmdline_wrapper ${D}/${bindir}/groff \ -F${STAGING_DIR_NATIVE}${datadir_native}/groff/${PV}/font \ -M${STAGING_DIR_NATIVE}${datadir_native}/groff/${PV}/tmac -- 1.7.9.5 _______________________________________________ Openembedded-core mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
