summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKang Kai <kai.kang@windriver.com>2011-06-07 16:29:41 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-14 15:28:22 +0100
commitef8144b9341fbb71fd97a4798ddb4254d2cb4a70 (patch)
tree8a563835312b9caedc0a2242501d4c189bcad272
parent218bcd597d4ba7b0a51f8e09bd7bff5e610676e4 (diff)
downloadpoky-ef8144b9341fbb71fd97a4798ddb4254d2cb4a70.tar.gz
ghostscript: update SRC_URI
Build ghostscript-native fails on a i686 machine because it can't get the source objarch.h and soobjarch.h, and .h files are not needed for native package, so update the SRC_URI to fix it. (From OE-Core rev: 4091e811c04245d53bc1bb82087e3e476c7c8c1a) Signed-off-by: Kang Kai <kai.kang@windriver.com> Removed the do_configure_prepend and folded into the target do_configure since the native was picking it up for the do_configure_virtclass/native() and then failing on i686. Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/ghostscript/ghostscript_9.02.bb19
1 files changed, 10 insertions, 9 deletions
diff --git a/meta/recipes-extended/ghostscript/ghostscript_9.02.bb b/meta/recipes-extended/ghostscript/ghostscript_9.02.bb
index e3d32ddab4..3cb5485d24 100644
--- a/meta/recipes-extended/ghostscript/ghostscript_9.02.bb
+++ b/meta/recipes-extended/ghostscript/ghostscript_9.02.bb
@@ -15,17 +15,20 @@ SECTION = "console/utils"
15LICENSE = "GPLv3" 15LICENSE = "GPLv3"
16LIC_FILES_CHKSUM = "file://LICENSE;md5=d151214b3131251dfc9d858593acbd24" 16LIC_FILES_CHKSUM = "file://LICENSE;md5=d151214b3131251dfc9d858593acbd24"
17 17
18PR = "r1" 18PR = "r2"
19 19
20DEPENDS = "${PN}-native tiff jpeg fontconfig cups" 20DEPENDS = "${PN}-native tiff jpeg fontconfig cups"
21DEPENDS_virtclass-native = "" 21DEPENDS_virtclass-native = ""
22 22
23SRC_URI = "http://downloads.ghostscript.com/public/ghostscript-${PV}.tar.bz2 \ 23SRC_URI_BASE = "http://downloads.ghostscript.com/public/ghostscript-${PV}.tar.bz2"
24
25SRC_URI = "${SRC_URI_BASE} \
24 file://ghostscript-9.02-prevent_recompiling.patch \ 26 file://ghostscript-9.02-prevent_recompiling.patch \
25 file://ghostscript-9.02-genarch.patch \ 27 file://ghostscript-9.02-genarch.patch \
26 file://objarch.h \ 28 file://objarch.h \
27 file://soobjarch.h \ 29 file://soobjarch.h \
28 " 30 "
31SRC_URI_virtclass-native = "${SRC_URI_BASE}"
29 32
30SRC_URI[md5sum] = "f67151444bd56a7904579fc75a083dd6" 33SRC_URI[md5sum] = "f67151444bd56a7904579fc75a083dd6"
31SRC_URI[sha256sum] = "03ea2cad13a36f8f9160912012b79619a826e7148fada6d3531feb25409ee05a" 34SRC_URI[sha256sum] = "03ea2cad13a36f8f9160912012b79619a826e7148fada6d3531feb25409ee05a"
@@ -34,14 +37,12 @@ EXTRA_OECONF = "--without-x --with-system-libtiff --without-jbig2dec --without-j
34 37
35inherit autotools 38inherit autotools
36 39
37do_configure_prepend () {
38 mkdir -p obj
39 mkdir -p soobj
40 cp ${WORKDIR}/objarch.h obj/arch.h
41 cp ${WORKDIR}/soobjarch.h soobj/arch.h
42}
43
44do_configure () { 40do_configure () {
41 mkdir -p obj
42 mkdir -p soobj
43 cp ${WORKDIR}/objarch.h obj/arch.h
44 cp ${WORKDIR}/soobjarch.h soobj/arch.h
45
45 oe_runconf 46 oe_runconf
46 47
47 # copy tools from the native ghostscript build 48 # copy tools from the native ghostscript build