summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/groff
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-18 17:38:05 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-18 22:18:52 +0100
commitac7a0311825e20c544d17bfd8be63546ad36e665 (patch)
treefaf4f050bb8e629a5892f6eb7b0260583ca29451 /meta/recipes-extended/groff
parent63f545b850ea4118a7e9e412aa8a22206dc7da8c (diff)
downloadpoky-ac7a0311825e20c544d17bfd8be63546ad36e665.tar.gz
bitbake.conf: Define USRBINPATH globally instead of individually
Many recipes are now having to define PERLPATH and PYTHONPATH variables. Creating USRBINPATH in bitbake.conf means we can remove all these lines from the many recipes now needing this and simplify the code changes needed in each case, reducing the chance of errors being introduced. Also fixup glib python binary location issue and fix function indentation. (From OE-Core rev: cf63d9068c3a8c635dfc240d30dfff278be9b0e2) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/groff')
-rw-r--r--meta/recipes-extended/groff/groff_1.20.1.bb8
1 files changed, 2 insertions, 6 deletions
diff --git a/meta/recipes-extended/groff/groff_1.20.1.bb b/meta/recipes-extended/groff/groff_1.20.1.bb
index c5a475a348..c7da1b4178 100644
--- a/meta/recipes-extended/groff/groff_1.20.1.bb
+++ b/meta/recipes-extended/groff/groff_1.20.1.bb
@@ -18,10 +18,6 @@ DEPENDS_virtclass-native = ""
18 18
19inherit autotools 19inherit autotools
20 20
21PERLPATH = "${bindir}/perl"
22PERLPATH_virtclass-native = "/usr/bin/env perl"
23PERLPATH_virtclass-nativesdk = "/usr/bin/env perl"
24
25EXTRA_OECONF = "--without-x" 21EXTRA_OECONF = "--without-x"
26PARALLEL_MAKE = "" 22PARALLEL_MAKE = ""
27 23
@@ -43,7 +39,7 @@ do_install_append() {
43 # for target as /usr/bin/perl, so fix it to /usr/bin/perl. 39 # for target as /usr/bin/perl, so fix it to /usr/bin/perl.
44 for i in afmtodit mmroff; do 40 for i in afmtodit mmroff; do
45 if [ -f ${D}${bindir}/$i ]; then 41 if [ -f ${D}${bindir}/$i ]; then
46 sed -i -e '1s,#!.*perl,#! ${PERLPATH},' ${D}${bindir}/$i 42 sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' ${D}${bindir}/$i
47 fi 43 fi
48 done 44 done
49} 45}
@@ -53,7 +49,7 @@ do_install_append_virtclass-native() {
53 # for target as /usr/bin/perl, so fix it to /usr/bin/perl. 49 # for target as /usr/bin/perl, so fix it to /usr/bin/perl.
54 for i in afmtodit mmroff; do 50 for i in afmtodit mmroff; do
55 if [ -f ${D}${bindir}/$i ]; then 51 if [ -f ${D}${bindir}/$i ]; then
56 sed -i -e '1s,#!.*perl,#! ${PERLPATH},' ${D}${bindir}/$i 52 sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' ${D}${bindir}/$i
57 fi 53 fi
58 done 54 done
59 55