summaryrefslogtreecommitdiff
path: root/meta
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 13:23:49 +0100
commit4091e811c04245d53bc1bb82087e3e476c7c8c1a (patch)
tree5a2610810a08bcbbac0d345916d2f3136e36e0ea /meta
parent2d17a75510c3f731f71def9460210b3e7354b6ca (diff)
downloadopenembedded-core-4091e811c04245d53bc1bb82087e3e476c7c8c1a.tar.gz
openembedded-core-4091e811c04245d53bc1bb82087e3e476c7c8c1a.tar.bz2
openembedded-core-4091e811c04245d53bc1bb82087e3e476c7c8c1a.zip
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. 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>
Diffstat (limited to 'meta')
-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"
LICENSE = "GPLv3"
LIC_FILES_CHKSUM = "file://LICENSE;md5=d151214b3131251dfc9d858593acbd24"
-PR = "r1"
+PR = "r2"
DEPENDS = "${PN}-native tiff jpeg fontconfig cups"
DEPENDS_virtclass-native = ""
-SRC_URI = "http://downloads.ghostscript.com/public/ghostscript-${PV}.tar.bz2 \
+SRC_URI_BASE = "http://downloads.ghostscript.com/public/ghostscript-${PV}.tar.bz2"
+
+SRC_URI = "${SRC_URI_BASE} \
file://ghostscript-9.02-prevent_recompiling.patch \
file://ghostscript-9.02-genarch.patch \
file://objarch.h \
file://soobjarch.h \
"
+SRC_URI_virtclass-native = "${SRC_URI_BASE}"
SRC_URI[md5sum] = "f67151444bd56a7904579fc75a083dd6"
SRC_URI[sha256sum] = "03ea2cad13a36f8f9160912012b79619a826e7148fada6d3531feb25409ee05a"
@@ -34,14 +37,12 @@ EXTRA_OECONF = "--without-x --with-system-libtiff --without-jbig2dec --without-j
inherit autotools
-do_configure_prepend () {
- mkdir -p obj
- mkdir -p soobj
- cp ${WORKDIR}/objarch.h obj/arch.h
- cp ${WORKDIR}/soobjarch.h soobj/arch.h
-}
-
do_configure () {
+ mkdir -p obj
+ mkdir -p soobj
+ cp ${WORKDIR}/objarch.h obj/arch.h
+ cp ${WORKDIR}/soobjarch.h soobj/arch.h
+
oe_runconf
# copy tools from the native ghostscript build