summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-25 13:15:04 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-27 10:25:34 +0000
commit71fded5145454b144413057e11f78f718d947093 (patch)
treefa3f66a88489eefd715eaf051a7fc2d1aa4f928d /meta/recipes-extended
parentc56232f9839188c74734799264027e7616f91981 (diff)
downloadpoky-71fded5145454b144413057e11f78f718d947093.tar.gz
ghostscript: Ensure we run reautoconf
Avoding the autoreconf with a hardcoded do_configure is bad practise since it can hide various errors. This patch ensures we do use the standard do_configure. (From OE-Core rev: 54c4b4fd10c104641bb7ae087b2230aa6c6085f8) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/ghostscript/ghostscript_9.04.bb32
1 files changed, 16 insertions, 16 deletions
diff --git a/meta/recipes-extended/ghostscript/ghostscript_9.04.bb b/meta/recipes-extended/ghostscript/ghostscript_9.04.bb
index 86d5ef2f1a..7178524167 100644
--- a/meta/recipes-extended/ghostscript/ghostscript_9.04.bb
+++ b/meta/recipes-extended/ghostscript/ghostscript_9.04.bb
@@ -15,7 +15,7 @@ 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 = "ghostscript-native tiff jpeg fontconfig cups" 20DEPENDS = "ghostscript-native tiff jpeg fontconfig cups"
21DEPENDS_virtclass-native = "" 21DEPENDS_virtclass-native = ""
@@ -44,18 +44,22 @@ BUILD_CFLAGS += "-DHAVE_SYS_TIME_H=1"
44 44
45inherit autotools 45inherit autotools
46 46
47do_configure () { 47do_configure_prepend () {
48 mkdir -p obj 48 mkdir -p obj
49 mkdir -p soobj 49 mkdir -p soobj
50 cp ${WORKDIR}/objarch.h obj/arch.h 50 if [ -e ${WORKDIR}/objarch.h ]; then
51 51 cp ${WORKDIR}/objarch.h obj/arch.h
52 oe_runconf 52 fi
53}
53 54
54 # copy tools from the native ghostscript build 55do_configure_append () {
55 mkdir -p obj/aux soobj 56 # copy tools from the native ghostscript build
56 for i in genarch genconf mkromfs echogs gendev genht; do 57 if [ "${PN}" != "ghostscript-native" ]; then
57 cp ${STAGING_BINDIR_NATIVE}/ghostscript-${PV}/$i obj/aux/$i 58 mkdir -p obj/aux soobj
58 done 59 for i in genarch genconf mkromfs echogs gendev genht; do
60 cp ${STAGING_BINDIR_NATIVE}/ghostscript-${PV}/$i obj/aux/$i
61 done
62 fi
59} 63}
60 64
61do_install_append () { 65do_install_append () {
@@ -72,10 +76,6 @@ python do_patch_virtclass-native () {
72 pass 76 pass
73} 77}
74 78
75do_configure_virtclass-native () {
76 oe_runconf
77}
78
79do_compile_virtclass-native () { 79do_compile_virtclass-native () {
80 mkdir -p obj 80 mkdir -p obj
81 for i in genarch genconf mkromfs echogs gendev genht; do 81 for i in genarch genconf mkromfs echogs gendev genht; do