summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXiaofeng Yan <xiaofeng.yan@windriver.com>2010-09-21 16:32:13 +0800
committerRichard Purdie <rpurdie@linux.intel.com>2010-09-22 00:03:00 +0100
commit23bfe02542e83c14948d791f45ff04159244a4b5 (patch)
treef18818d971b321639b7003557a04d4fe2ec00caa
parent3c5984a5ba8cde2171e0cfb62803c5e6a7bf35e6 (diff)
downloadpoky-23bfe02542e83c14948d791f45ff04159244a4b5.tar.gz
[#BUG298]:Fix some bugs during compiling based on x86_64
fix a problem that compliation failed for groff on machine x86_64 Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
-rw-r--r--meta/recipes-extended/groff/groff_1.18.1.4.bb37
1 files changed, 16 insertions, 21 deletions
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 a215745ce4..b78cbfa02d 100644
--- a/meta/recipes-extended/groff/groff_1.18.1.4.bb
+++ b/meta/recipes-extended/groff/groff_1.18.1.4.bb
@@ -3,44 +3,39 @@ SECTION = "console/utils"
3PRIORITY = "required" 3PRIORITY = "required"
4HOMEPAGE = "ftp://ftp.gnu.org/gnu/groff/" 4HOMEPAGE = "ftp://ftp.gnu.org/gnu/groff/"
5LICENSE = "GPLv2" 5LICENSE = "GPLv2"
6PR = "r0" 6PR = "r1"
7 7
8LIC_FILE_CHKSUM = "file://CORYING;md5=e43fc16fccd8519fba405f0a0ff6e8a3" 8LIC_FILE_CHKSUM = "file://CORYING;md5=e43fc16fccd8519fba405f0a0ff6e8a3"
9 9
10SRC_URI = "ftp://ftp.gnu.org/gnu/groff/groff-1.18.1.4.tar.gz \ 10SRC_URI = "ftp://ftp.gnu.org/gnu/groff/groff-${PV}.tar.gz \
11 file://groff-1.18.1.4-remove-mom.patch;striplevel=1 \ 11 file://groff-1.18.1.4-remove-mom.patch;striplevel=1 \
12 file://man-local.patch;patch=1 \ 12 file://man-local.patch \
13 file://mdoc-local.patch;patch=1" 13 file://mdoc-local.patch"
14 14
15inherit autotools 15inherit autotools
16 16
17EXTRA_OEMAKE =+ "-f Makefile mandir=${D}${mandir}" 17EXTRA_OECONF="--without-x --prefix=${D} --exec-prefix=${D} --bindir=${D}${bindir} --datadir=${D}${datadir} --mandir=${D}${datadir}/man --infodir=${D}${datadir}info --with-appresdir=${D}${datadir}"
18PARALLEL_MAKE = ""
19
18 20
19localdir=/usr/local/
20do_configure (){ 21do_configure (){
21 mkdir -p ${D}/usr/local 22 oe_runconf
22 ${S}/configure --prefix=${D}/usr/local
23} 23}
24 24
25 25do_install_prepend() {
26fakeroot do_install(){ 26 install -m 0755 -d ${D}
27 mkdir -p ${D}/usr/local/man/man1
28 mkdir -p ${D}/usr/local/man/man5
29 mkdir -p ${D}/usr/local/man/man7
30 oe_runmake install DESTDIR=${D}
31} 27}
32 28
29
33do_install_append() { 30do_install_append() {
34 mv ${D}/usr/local/bin ${D}/usr 31 mkdir -p ${D}${sysconfdir}/groff
35 mkdir -p ${D}${sysconfdir}/groff 32 cp -rf ${D}${datadir}/groff/site-tmac/* ${D}${sysconfdir}/groff/
36 cp -rf ${D}/usr/local/share/groff/site-tmac/* ${D}/usr/local/share/groff/1.18.1.4/tmac/ 33 cp -rf ${D}${datadir}/groff/site-tmac/* ${D}${datadir}/groff/${PV}/tmac/
37 cp -rf ${D}/usr/local/share/groff/site-tmac/* ${D}${sysconfdir}/groff/
38} 34}
39 35
40pkg_postinst_${PN}() { 36pkg_postinst_${PN}() {
41 ln -s ${bindir}/tbl ${bindir}/gtbl 37 ln -s ${bindir}/tbl ${bindir}/gtbl
42 echo "export GROFF_FONT_PATH=/usr/local/share/groff/1.18.1.4/font" >> ${sysconfdir}/profile 38 echo "export GROFF_FONT_PATH=/usr/share/groff/${PV}/font" >> ${sysconfdir}/profile
43 echo "export GROFF_TMAC_PATH=/usr/local/share/groff/1.18.1.4/tmac" >> ${sysconfdir}/profile 39 echo "export GROFF_TMAC_PATH=/usr/share/groff/${PV}/tmac" >> ${sysconfdir}/profile
44} 40}
45 41
46FILES_${PN} += "${localdir}/"