[oe-commits] Ming Liu : groff: Fix build on Fedora 17 for 1.18.1.4

git at git.openembedded.org git at git.openembedded.org
Thu Jul 3 12:16:43 UTC 2014


Module: openembedded-core.git
Branch: master-next
Commit: b019f2cdacfb64f149483df8a5b6b7b3f7943222
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=b019f2cdacfb64f149483df8a5b6b7b3f7943222

Author: Ming Liu <ming.liu at windriver.com>
Date:   Thu Jul  3 17:30:00 2014 +0800

groff: Fix build on Fedora 17 for 1.18.1.4

The commit 79fc5576:
[ groff: Fix build on Fedora 17 ]

was applied to 1.22.2, but it's also needed by 1.18.1.4 to solve a same
issue.

Signed-off-by: Ming Liu <ming.liu at windriver.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-extended/groff/groff_1.18.1.4.bb | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/meta/recipes-extended/groff/groff_1.18.1.4.bb b/meta/recipes-extended/groff/groff_1.18.1.4.bb
index 85357c5..6871949 100644
--- a/meta/recipes-extended/groff/groff_1.18.1.4.bb
+++ b/meta/recipes-extended/groff/groff_1.18.1.4.bb
@@ -26,6 +26,14 @@ do_configure (){
 }
 
 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
+
 	mkdir -p ${D}${sysconfdir}/groff
 	cp -rf ${D}${datadir}/groff/site-tmac/* ${D}${sysconfdir}/groff/
 	cp -rf ${D}${datadir}/groff/site-tmac/* ${D}${datadir}/groff/${PV}/tmac/



More information about the Openembedded-commits mailing list