From ef8144b9341fbb71fd97a4798ddb4254d2cb4a70 Mon Sep 17 00:00:00 2001 From: Kang Kai Date: Tue, 7 Jun 2011 16:29:41 +0800 Subject: 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 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 Signed-off-by: Richard Purdie --- meta/recipes-extended/ghostscript/ghostscript_9.02.bb | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'meta/recipes-extended/ghostscript') 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 -- cgit v1.2.3-54-g00ecf