From: Saul Wold <saul.wold@intel.com>
To: Patches and discussions about the oe-core layer
<openembedded-core@lists.openembedded.org>
Subject: Re: [PATCH 1/4] ghostscript: update to 9.04
Date: Tue, 18 Oct 2011 19:43:00 -0700 [thread overview]
Message-ID: <4E9E3934.8020703@intel.com> (raw)
In-Reply-To: <9a64b30b232beef0986f2605ed99d3d76a1ab7b1.1318989087.git.kai.kang@windriver.com>
On 10/18/2011 07:00 PM, Kang Kai wrote:
> Remove the old version and update ghostscript to 9.04.
>
> * update ghostscript-9.02-prevent_recompiling.patch
> * because soobj is not used any more, remove soobj related work
If soobj is no longer needed, can you also remove the patch file?
Sau!
> * gs add a configure option --with-install-cups to install cups related
> files, so update post install scripts
>
> Signed-off-by: Kang Kai<kai.kang@windriver.com>
> ---
> .../ghostscript-9.02-prevent_recompiling.patch | 74 ++++++++++----------
> .../{ghostscript_9.02.bb => ghostscript_9.04.bb} | 24 +++---
> 2 files changed, 49 insertions(+), 49 deletions(-)
> rename meta/recipes-extended/ghostscript/{ghostscript_9.02.bb => ghostscript_9.04.bb} (81%)
>
> diff --git a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-prevent_recompiling.patch b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-prevent_recompiling.patch
> index 8fde77f..c37e4c4 100644
> --- a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-prevent_recompiling.patch
> +++ b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-prevent_recompiling.patch
> @@ -6,39 +6,39 @@ Upstream-Status: Pending
>
> Signed-off-by: Kang Kai<kai.kang@windriver.com>
>
> ---- a/base/unix-aux.mak.orig 2011-05-03 15:35:55.196887997 +0800
> -+++ b/base/unix-aux.mak 2011-05-03 15:37:57.766888003 +0800
> -@@ -57,45 +57,45 @@ $(GLOBJ)gp_sysv.$(OBJ): $(GLSRC)gp_sysv.
> +--- a/base/unix-aux.mak.orig 2011-10-17 16:12:20.354167007 +0800
> ++++ a/base/unix-aux.mak 2011-10-17 16:16:26.774167008 +0800
> +@@ -67,45 +67,45 @@
>
> # -------------------------- Auxiliary programs --------------------------- #
>
> --$(ECHOGS_XE): $(GLSRC)echogs.c $(AK) $(stdpre_h)
> -- $(CCAUX) $(I_)$(GLSRCDIR)$(_I) $(O_)$(ECHOGS_XE) $(GLSRC)echogs.c
> +-$(ECHOGS_XE): $(GLSRC)echogs.c $(AK) $(stdpre_h) $(MAKEDIRS)
> +- $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(ECHOGS_XE) $(GLSRC)echogs.c
> -
> -# On the RS/6000 (at least), compiling genarch.c with gcc with -O
> -# produces a buggy executable.
> --$(GENARCH_XE): $(GLSRC)genarch.c $(AK) $(GENARCH_DEPS)
> -- $(CCAUX) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENARCH_XE) $(GLSRC)genarch.c
> +-$(GENARCH_XE): $(GLSRC)genarch.c $(AK) $(GENARCH_DEPS) $(MAKEDIRS)
> +- $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENARCH_XE) $(GLSRC)genarch.c
> -
> --$(GENCONF_XE): $(GLSRC)genconf.c $(AK) $(GENCONF_DEPS)
> -- $(CCAUX) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENCONF_XE) $(GLSRC)genconf.c
> +-$(GENCONF_XE): $(GLSRC)genconf.c $(AK) $(GENCONF_DEPS) $(MAKEDIRS)
> +- $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENCONF_XE) $(GLSRC)genconf.c
> -
> --$(GENDEV_XE): $(GLSRC)gendev.c $(AK) $(GENDEV_DEPS)
> -- $(CCAUX) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENDEV_XE) $(GLSRC)gendev.c
> +-$(GENDEV_XE): $(GLSRC)gendev.c $(AK) $(GENDEV_DEPS) $(MAKEDIRS)
> +- $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENDEV_XE) $(GLSRC)gendev.c
> -
> --$(GENHT_XE): $(GLSRC)genht.c $(AK) $(GENHT_DEPS)
> -- $(CCAUX) $(GENHT_CFLAGS) $(O_)$(GENHT_XE) $(GLSRC)genht.c
> +-$(GENHT_XE): $(GLSRC)genht.c $(AK) $(GENHT_DEPS) $(MAKEDIRS)
> +- $(CCAUX_) $(GENHT_CFLAGS) $(O_)$(GENHT_XE) $(GLSRC)genht.c
> -
> -# To get GS to use the system zlib, you remove/hide the gs/zlib directory
> -# which means that the mkromfs build can't find the zlib source it needs.
> -# So it's split into two targets, one using the zlib source directly.....
> --MKROMFS_OBJS_0=$(MKROMFS_ZLIB_OBJS) $(GLOBJ)gscdefs.$(OBJ) $(GLOBJ)gsmisc.$(OBJ) \
> -- $(GLOBJ)gpmisc.$(OBJ) $(GLOBJ)gslibctx.$(OBJ) $(GLOBJ)gp_getnv.$(OBJ) \
> -- $(GLOBJ)gp_unix.$(OBJ) $(GLOBJ)gp_unifs.$(OBJ) $(GLOBJ)gp_unifn.$(OBJ) \
> -- $(GLOBJ)gp_stdia.$(OBJ) $(GLOBJ)gsutil.$(OBJ)
> +-MKROMFS_OBJS_0=$(MKROMFS_ZLIB_OBJS) $(AUX)gscdefs.$(OBJ) $(AUX)gsmisc.$(OBJ) \
> +- $(AUX)gpmisc.$(OBJ) $(AUX)gslibctx.$(OBJ) $(AUX)gp_getnv.$(OBJ) \
> +- $(AUX)gp_unix.$(OBJ) $(AUX)gp_unifs.$(OBJ) $(AUX)gp_unifn.$(OBJ) \
> +- $(AUX)gp_stdia.$(OBJ) $(AUX)gsutil.$(OBJ) $(AUX)memento.$(OBJ)
> -
> -$(MKROMFS_XE)_0: $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS_0)
> -- $(CCAUX) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_0 $(MKROMFS_OBJS_0) -lm $(EXTRALIBS)
> +- $(CCAUX_) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_0 $(MKROMFS_OBJS_0) -lm $(EXTRALIBS)
> -
> -# .... and one using the zlib library linked via the command line
> -MKROMFS_OBJS_1=$(GLOBJ)gscdefs.$(OBJ) $(GLOBJ)gsmisc.$(OBJ) \
> @@ -47,37 +47,37 @@ Signed-off-by: Kang Kai<kai.kang@windriver.com>
> - $(GLOBJ)gp_stdia.$(OBJ) $(GLOBJ)gsutil.$(OBJ)
> -
> -$(MKROMFS_XE)_1: $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS_1)
> -- $(CCAUX) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_1 $(MKROMFS_OBJS_1) -lm $(EXTRALIBS)
> +- $(CCAUX_) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_1 $(MKROMFS_OBJS_1) -lm $(EXTRALIBS)
> -
> --$(MKROMFS_XE): $(MKROMFS_XE)_$(SHARE_ZLIB)
> +-$(MKROMFS_XE): $(MKROMFS_XE)_$(SHARE_ZLIB) $(MAKEDIRS)
> - $(CP_) $(MKROMFS_XE)_$(SHARE_ZLIB) $(MKROMFS_XE)
> -+#$(ECHOGS_XE): $(GLSRC)echogs.c $(AK) $(stdpre_h)
> -+# $(CCAUX) $(I_)$(GLSRCDIR)$(_I) $(O_)$(ECHOGS_XE) $(GLSRC)echogs.c
> ++#$(ECHOGS_XE): $(GLSRC)echogs.c $(AK) $(stdpre_h) $(MAKEDIRS)
> ++# $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(ECHOGS_XE) $(GLSRC)echogs.c
> +#
> +## On the RS/6000 (at least), compiling genarch.c with gcc with -O
> +## produces a buggy executable.
> -+#$(GENARCH_XE): $(GLSRC)genarch.c $(AK) $(GENARCH_DEPS)
> -+# $(CCAUX) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENARCH_XE) $(GLSRC)genarch.c
> ++#$(GENARCH_XE): $(GLSRC)genarch.c $(AK) $(GENARCH_DEPS) $(MAKEDIRS)
> ++# $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENARCH_XE) $(GLSRC)genarch.c
> +#
> -+#$(GENCONF_XE): $(GLSRC)genconf.c $(AK) $(GENCONF_DEPS)
> -+# $(CCAUX) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENCONF_XE) $(GLSRC)genconf.c
> ++#$(GENCONF_XE): $(GLSRC)genconf.c $(AK) $(GENCONF_DEPS) $(MAKEDIRS)
> ++# $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENCONF_XE) $(GLSRC)genconf.c
> +#
> -+#$(GENDEV_XE): $(GLSRC)gendev.c $(AK) $(GENDEV_DEPS)
> -+# $(CCAUX) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENDEV_XE) $(GLSRC)gendev.c
> ++#$(GENDEV_XE): $(GLSRC)gendev.c $(AK) $(GENDEV_DEPS) $(MAKEDIRS)
> ++# $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENDEV_XE) $(GLSRC)gendev.c
> +#
> -+#$(GENHT_XE): $(GLSRC)genht.c $(AK) $(GENHT_DEPS)
> -+# $(CCAUX) $(GENHT_CFLAGS) $(O_)$(GENHT_XE) $(GLSRC)genht.c
> ++#$(GENHT_XE): $(GLSRC)genht.c $(AK) $(GENHT_DEPS) $(MAKEDIRS)
> ++# $(CCAUX_) $(GENHT_CFLAGS) $(O_)$(GENHT_XE) $(GLSRC)genht.c
> +#
> +## To get GS to use the system zlib, you remove/hide the gs/zlib directory
> +## which means that the mkromfs build can't find the zlib source it needs.
> +## So it's split into two targets, one using the zlib source directly.....
> -+#MKROMFS_OBJS_0=$(MKROMFS_ZLIB_OBJS) $(GLOBJ)gscdefs.$(OBJ) $(GLOBJ)gsmisc.$(OBJ) \
> -+# $(GLOBJ)gpmisc.$(OBJ) $(GLOBJ)gslibctx.$(OBJ) $(GLOBJ)gp_getnv.$(OBJ) \
> -+# $(GLOBJ)gp_unix.$(OBJ) $(GLOBJ)gp_unifs.$(OBJ) $(GLOBJ)gp_unifn.$(OBJ) \
> -+# $(GLOBJ)gp_stdia.$(OBJ) $(GLOBJ)gsutil.$(OBJ)
> ++#MKROMFS_OBJS_0=$(MKROMFS_ZLIB_OBJS) $(AUX)gscdefs.$(OBJ) $(AUX)gsmisc.$(OBJ) \
> ++# $(AUX)gpmisc.$(OBJ) $(AUX)gslibctx.$(OBJ) $(AUX)gp_getnv.$(OBJ) \
> ++# $(AUX)gp_unix.$(OBJ) $(AUX)gp_unifs.$(OBJ) $(AUX)gp_unifn.$(OBJ) \
> ++# $(AUX)gp_stdia.$(OBJ) $(AUX)gsutil.$(OBJ) $(AUX)memento.$(OBJ)
> +#
> +#$(MKROMFS_XE)_0: $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS_0)
> -+# $(CCAUX) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_0 $(MKROMFS_OBJS_0) -lm $(EXTRALIBS)
> ++# $(CCAUX_) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_0 $(MKROMFS_OBJS_0) -lm $(EXTRALIBS)
> +#
> +## .... and one using the zlib library linked via the command line
> +#MKROMFS_OBJS_1=$(GLOBJ)gscdefs.$(OBJ) $(GLOBJ)gsmisc.$(OBJ) \
> @@ -86,9 +86,9 @@ Signed-off-by: Kang Kai<kai.kang@windriver.com>
> +# $(GLOBJ)gp_stdia.$(OBJ) $(GLOBJ)gsutil.$(OBJ)
> +#
> +#$(MKROMFS_XE)_1: $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS_1)
> -+# $(CCAUX) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_1 $(MKROMFS_OBJS_1) -lm $(EXTRALIBS)
> ++# $(CCAUX_) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_1 $(MKROMFS_OBJS_1) -lm $(EXTRALIBS)
> +#
> -+#$(MKROMFS_XE): $(MKROMFS_XE)_$(SHARE_ZLIB)
> ++#$(MKROMFS_XE): $(MKROMFS_XE)_$(SHARE_ZLIB) $(MAKEDIRS)
> +# $(CP_) $(MKROMFS_XE)_$(SHARE_ZLIB) $(MKROMFS_XE)
>
> # Query the environment to construct gconfig_.h.
> diff --git a/meta/recipes-extended/ghostscript/ghostscript_9.02.bb b/meta/recipes-extended/ghostscript/ghostscript_9.04.bb
> similarity index 81%
> rename from meta/recipes-extended/ghostscript/ghostscript_9.02.bb
> rename to meta/recipes-extended/ghostscript/ghostscript_9.04.bb
> index 9b21c66..8dcac90 100644
> --- a/meta/recipes-extended/ghostscript/ghostscript_9.02.bb
> +++ b/meta/recipes-extended/ghostscript/ghostscript_9.04.bb
> @@ -15,24 +15,24 @@ SECTION = "console/utils"
> LICENSE = "GPLv3"
> LIC_FILES_CHKSUM = "file://LICENSE;md5=d151214b3131251dfc9d858593acbd24"
>
> -PR = "r4"
> +PR = "r0"
>
> DEPENDS = "ghostscript-native tiff jpeg fontconfig cups"
> DEPENDS_virtclass-native = ""
>
> -SRC_URI_BASE = "http://downloads.ghostscript.com/public/ghostscript-${PV}.tar.bz2"
> +SRC_URI_BASE = "http://downloads.ghostscript.com/public/ghostscript-${PV}.tar.gz"
>
> SRC_URI = "${SRC_URI_BASE} \
> file://ghostscript-9.02-prevent_recompiling.patch \
> file://ghostscript-9.02-genarch.patch \
> file://objarch.h \
> - file://soobjarch.h \
> file://ghostscript-9.02-parallel-make.patch \
> "
> +
> SRC_URI_virtclass-native = "${SRC_URI_BASE}"
>
> -SRC_URI[md5sum] = "f67151444bd56a7904579fc75a083dd6"
> -SRC_URI[sha256sum] = "03ea2cad13a36f8f9160912012b79619a826e7148fada6d3531feb25409ee05a"
> +SRC_URI[md5sum] = "9c2fb4af1eb609d09dba5bb0fa76173a"
> +SRC_URI[sha256sum] = "f1e333738c41c3bf2b47ceb9806abb8045bcdc7353002c32736150425a7c1ef4"
>
> EXTRA_OECONF = "--without-x --with-system-libtiff --without-jbig2dec --without-jasper --with-fontpath=${datadir}/fonts"
>
> @@ -47,15 +47,13 @@ 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
> - mkdir -p obj soobj
> + mkdir -p obj/aux soobj
> for i in genarch genconf mkromfs echogs gendev genht; do
> - cp ${STAGING_BINDIR_NATIVE}/ghostscript-${PV}/$i obj/$i
> - cp ${STAGING_BINDIR_NATIVE}/ghostscript-${PV}/$i soobj/$i
> + cp ${STAGING_BINDIR_NATIVE}/ghostscript-${PV}/$i obj/aux/$i
> done
> }
>
> @@ -64,7 +62,9 @@ do_install_append () {
> cp -r Resource ${D}${datadir}/ghostscript/${PV}/
> cp -r iccprofiles ${D}${datadir}/ghostscript/${PV}/
>
> - chown -R root:lp ${D}${sysconfdir}/cups
> + if [ -f ${D}${sysconfdir}/cups ]; then
> + chown -R root:lp ${D}${sysconfdir}/cups
> + fi
> }
>
> python do_patch_virtclass-native () {
> @@ -78,14 +78,14 @@ do_configure_virtclass-native () {
> do_compile_virtclass-native () {
> mkdir -p obj
> for i in genarch genconf mkromfs echogs gendev genht; do
> - oe_runmake obj/$i
> + oe_runmake obj/aux/$i
> done
> }
>
> do_install_virtclass-native () {
> install -d ${D}${bindir}/ghostscript-${PV}
> for i in genarch genconf mkromfs echogs gendev genht; do
> - install -m 755 obj/$i ${D}${bindir}/ghostscript-${PV}/$i
> + install -m 755 obj/aux/$i ${D}${bindir}/ghostscript-${PV}/$i
> done
> }
>
next prev parent reply other threads:[~2011-10-19 2:48 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-19 2:00 [PATCH 0/4] Update packages Kang Kai
2011-10-19 2:00 ` [PATCH 1/4] ghostscript: update to 9.04 Kang Kai
2011-10-19 2:43 ` Saul Wold [this message]
2011-10-19 2:00 ` [PATCH 2/4] xdg-utils: update to 1.1.0 rc1 Kang Kai
2011-10-19 2:42 ` Saul Wold
2011-10-19 2:47 ` Kang Kai
2011-10-19 2:00 ` [PATCH 3/4] libxml-sax-perl: update to 0.96 Kang Kai
2011-10-19 2:00 ` [PATCH 4/4] liburi-perl: update to 1.59 Kang Kai
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4E9E3934.8020703@intel.com \
--to=saul.wold@intel.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox