[PATCH] ghostscript: separate objarch.h based on architecture

[PATCH] ghostscript: separate objarch.h based on architecture

[Rebecca Chang Swee Fun]

From: "Chang, Rebecca Swee Fun" <rebecca.swee.fun.chang@intel.com>

The following warning occurs when building with meta-zephyr
with MACHINE set to arduino-101-sss:

WARNING: /srv/sdc/builds/11319/meta/recipes-extended/ghostscript/ghostscript_9.20.bb: Unable to get checksum for ghostscript SRC_URI entry objarch.h: file could not be found

This is due to the the TUNE_FEATURES for meta-zephyr is not available
and cause bitbake unable to locate the correct config file during
recipe parse.

This will introduce a new variable ${ARCHFILE} to segregate objarch.h
based on architecture. For the architecture that are not listed, recipe
shall not parsed with objarch.h and shall not introduce warnings.

[YOCTO #11344]

Signed-off-by: Chang, Rebecca Swee Fun <rebecca.swee.fun.chang@intel.com>
---
 .../ghostscript/ghostscript_9.20.bb                | 38 +++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-extended/ghostscript/ghostscript_9.20.bb b/meta/recipes-extended/ghostscript/ghostscript_9.20.bb
index e8fc5df..163f06a 100644
--- a/meta/recipes-extended/ghostscript/ghostscript_9.20.bb
+++ b/meta/recipes-extended/ghostscript/ghostscript_9.20.bb
@@ -29,9 +29,9 @@ SRC_URI_BASE = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/d
 SRC_URI = "${SRC_URI_BASE} \
            file://ghostscript-9.02-prevent_recompiling.patch \
            file://ghostscript-9.02-genarch.patch \
-           file://objarch.h \
            file://cups-no-gcrypt.patch \
            file://CVE-2017-7207.patch \
+           ${ARCHFILE} \
            "
 
 SRC_URI_class-native = "${SRC_URI_BASE} \
@@ -42,6 +42,42 @@ SRC_URI_class-native = "${SRC_URI_BASE} \
 SRC_URI[md5sum] = "93c5987cd3ab341108be1ebbaadc24fe"
 SRC_URI[sha256sum] = "949b64b46ecf8906db54a94ecf83ab97534ebf946f770d3c3f283cb469cb6e14"
 
+ARCHFILE ?= ""
+
+ARCHFILE_aarch64 = "file://objarch.h"
+
+ARCHFILE_arm = "file://objarch.h"
+
+ARCHFILE_armeb = "file://objarch.h"
+
+ARCHFILE_i586 = "file://objarch.h"
+
+ARCHFILE_i686 = "file://objarch.h"
+
+ARCHFILE_microblazeeb = "file://objarch.h"
+
+ARCHFILE_microblazeel = "file://objarch.h"
+
+ARCHFILE_mipsarchn32eb = "file://objarch.h"
+
+ARCHFILE_mipsarchn32el = "file://objarch.h"
+
+ARCHFILE_mipsarchn64eb = "file://objarch.h"
+
+ARCHFILE_mipsarchn64el = "file://objarch.h"
+
+ARCHFILE_mipsarcho32eb = "file://objarch.h"
+
+ARCHFILE_mipsarcho32el = "file://objarch.h"
+
+ARCHFILE_nios2 = "file://objarch.h"
+
+ARCHFILE_powerpc = "file://objarch.h"
+
+ARCHFILE_powerpc64 = "file://objarch.h"
+
+ARCHFILE_x86-64 = "file://objarch.h"
+
 EXTRA_OECONF = "--without-x --with-system-libtiff --without-jbig2dec \
                 --with-fontpath=${datadir}/fonts \
                 --without-libidn --with-cups-serverbin=${exec_prefix}/lib/cups \
-- 
2.7.4

Re: [PATCH] ghostscript: separate objarch.h based on architecture

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 1073 bytes --]

On 13 April 2017 at 10:11, Rebecca Chang Swee Fun <
rebecca.swee.fun.chang@intel.com> wrote:

> +ARCHFILE ?= ""
> +
> +ARCHFILE_aarch64 = "file://objarch.h"
> +
> +ARCHFILE_arm = "file://objarch.h"
> +
> +ARCHFILE_armeb = "file://objarch.h"
> +
> +ARCHFILE_i586 = "file://objarch.h"
> +
> +ARCHFILE_i686 = "file://objarch.h"
> +
> +ARCHFILE_microblazeeb = "file://objarch.h"
> +
> +ARCHFILE_microblazeel = "file://objarch.h"
> +
> +ARCHFILE_mipsarchn32eb = "file://objarch.h"
> +
> +ARCHFILE_mipsarchn32el = "file://objarch.h"
> +
> +ARCHFILE_mipsarchn64eb = "file://objarch.h"
> +
> +ARCHFILE_mipsarchn64el = "file://objarch.h"
> +
> +ARCHFILE_mipsarcho32eb = "file://objarch.h"
> +
> +ARCHFILE_mipsarcho32el = "file://objarch.h"
> +
> +ARCHFILE_nios2 = "file://objarch.h"
> +
> +ARCHFILE_powerpc = "file://objarch.h"
> +
> +ARCHFILE_powerpc64 = "file://objarch.h"
> +
> +ARCHFILE_x86-64 = "file://objarch.h"
>

That's a very long list, would it be easier to set it to objarch.h and then
use select overrides to clear it?

Ross

[-- Attachment #2: Type: text/html, Size: 1737 bytes --]

Re: [PATCH] ghostscript: separate objarch.h based on architecture

[Richard Purdie]

On Thu, 2017-04-13 at 15:06 +0100, Burton, Ross wrote:
> 
> On 13 April 2017 at 10:11, Rebecca Chang Swee Fun <rebecca.swee.fun.c
> hang@intel.com> wrote:
> > +ARCHFILE ?= ""
> > +
> > +ARCHFILE_aarch64 = "file://objarch.h"
> > +
> > +ARCHFILE_arm = "file://objarch.h"
> > +
> > +ARCHFILE_armeb = "file://objarch.h"
> > +
> > +ARCHFILE_i586 = "file://objarch.h"
> > +
> > +ARCHFILE_i686 = "file://objarch.h"
> > +
> > +ARCHFILE_microblazeeb = "file://objarch.h"
> > +
> > +ARCHFILE_microblazeel = "file://objarch.h"
> > +
> > +ARCHFILE_mipsarchn32eb = "file://objarch.h"
> > +
> > +ARCHFILE_mipsarchn32el = "file://objarch.h"
> > +
> > +ARCHFILE_mipsarchn64eb = "file://objarch.h"
> > +
> > +ARCHFILE_mipsarchn64el = "file://objarch.h"
> > +
> > +ARCHFILE_mipsarcho32eb = "file://objarch.h"
> > +
> > +ARCHFILE_mipsarcho32el = "file://objarch.h"
> > +
> > +ARCHFILE_nios2 = "file://objarch.h"
> > +
> > +ARCHFILE_powerpc = "file://objarch.h"
> > +
> > +ARCHFILE_powerpc64 = "file://objarch.h"
> > +
> > +ARCHFILE_x86-64 = "file://objarch.h"
> > 
> That's a very long list, would it be easier to set it to objarch.h
> and then use select overrides to clear it?

Its basically copying the structure from the disk which we don't want
to do.

I think what this recipe needs to do is raise a SkipRecipe exception if
it not one of the supported architectures. This would then only display
an error if someone specifically tries to build the recipe.

Cheers,

Richard