summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJesse Zhang <sen.zhang@windriver.com>2013-01-06 09:56:19 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-08 14:50:37 +0000
commit981bd3a297ff51f30bebfa189e1516c7507cf278 (patch)
tree0b35ccded5af498f9f56d24ea2685a1570553587 /meta
parent858646c7bd11d1dad8c14e30f3fe6b4bd58a31b2 (diff)
downloadpoky-981bd3a297ff51f30bebfa189e1516c7507cf278.tar.gz
ghostscript: fix endianness detection
[ CQID: WIND00394747 ] The original patch removes endianness detection completely, causing lcms to be built against the wrong endian. Instead, pass the correct endian through the recipe using SITEINFO_ENDIANNESS. (From OE-Core rev: 0a07ec7d13becc7ce87c502e75a006300a7090a5) Signed-off-by: Jesse Zhang <sen.zhang@windriver.com> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.05-NOT-check-endian.patch40
-rw-r--r--meta/recipes-extended/ghostscript/ghostscript_9.05.bb9
2 files changed, 17 insertions, 32 deletions
diff --git a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.05-NOT-check-endian.patch b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.05-NOT-check-endian.patch
index ab4326f3c5..c79063f7c1 100644
--- a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.05-NOT-check-endian.patch
+++ b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.05-NOT-check-endian.patch
@@ -4,15 +4,14 @@ So remove the check for Yocto.
4Upstream-Status: Pending 4Upstream-Status: Pending
5 5
6Signed-off-by: Kang Kai <kai.kang@windriver.com> 6Signed-off-by: Kang Kai <kai.kang@windriver.com>
7Signed-off-by: Sen Zhang <sen.zhang@windriver.com>
7 8
8--- ghostscript-9.05/base/configure.ac.orig 2012-03-14 15:28:30.828956872 +0800 9--- ghostscript-9.05/base/configure.ac.orig 2013-01-06 10:02:08.699479511 +0800
9+++ ghostscript-9.05/base/configure.ac 2012-03-14 15:29:05.060957357 +0800 10+++ ghostscript-9.05/base/configure.ac 2013-01-06 10:01:52.275382106 +0800
10@@ -1739,25 +1739,25 @@ 11@@ -1741,13 +1741,13 @@
11 dnl check for big/little endian for LCMS 12
12 dnl -------------------------------------------------- 13 AC_MSG_CHECKING([for big endian])
13 14
14-AC_MSG_CHECKING([for big endian])
15-
16-AC_RUN_IFELSE( 15-AC_RUN_IFELSE(
17- [AC_LANG_PROGRAM([#include <stdio.h>], [ 16- [AC_LANG_PROGRAM([#include <stdio.h>], [
18- static const int one = 1; 17- static const int one = 1;
@@ -20,18 +19,6 @@ Signed-off-by: Kang Kai <kai.kang@windriver.com>
20- ])], 19- ])],
21- [LCMS_BIGENDIAN=1], 20- [LCMS_BIGENDIAN=1],
22- [LCMS_BIGENDIAN=0]) 21- [LCMS_BIGENDIAN=0])
23-
24-if test "x$LCMS_BIGENDIAN" != "x0"; then
25- LCMS_ENDIAN="-DUSE_BIG_ENDIAN=$LCMS_BIGENDIAN"
26- LCMS2_ENDIAN="-DCMS_USE_BIG_ENDIAN=$LCMS_BIGENDIAN"
27- AC_MSG_RESULT(yes)
28-else
29- LCMS_ENDIAN=
30- LCMS2_ENDIAN=
31- AC_MSG_RESULT(no)
32-fi
33+dnl AC_MSG_CHECKING([for big endian])
34+dnl
35+dnl AC_RUN_IFELSE( 22+dnl AC_RUN_IFELSE(
36+dnl [AC_LANG_PROGRAM([#include <stdio.h>], [ 23+dnl [AC_LANG_PROGRAM([#include <stdio.h>], [
37+dnl static const int one = 1; 24+dnl static const int one = 1;
@@ -39,16 +26,7 @@ Signed-off-by: Kang Kai <kai.kang@windriver.com>
39+dnl ])], 26+dnl ])],
40+dnl [LCMS_BIGENDIAN=1], 27+dnl [LCMS_BIGENDIAN=1],
41+dnl [LCMS_BIGENDIAN=0]) 28+dnl [LCMS_BIGENDIAN=0])
42+dnl
43+dnl if test "x$LCMS_BIGENDIAN" != "x0"; then
44+dnl LCMS_ENDIAN="-DUSE_BIG_ENDIAN=$LCMS_BIGENDIAN"
45+dnl LCMS2_ENDIAN="-DCMS_USE_BIG_ENDIAN=$LCMS_BIGENDIAN"
46+dnl AC_MSG_RESULT(yes)
47+dnl else
48+dnl LCMS_ENDIAN=
49+dnl LCMS2_ENDIAN=
50+dnl AC_MSG_RESULT(no)
51+dnl fi
52
53 29
54 AC_SUBST(LCMS_ENDIAN) 30 if test "x$LCMS_BIGENDIAN" != "x0"; then
31 LCMS_ENDIAN="-DUSE_BIG_ENDIAN=$LCMS_BIGENDIAN"
32
diff --git a/meta/recipes-extended/ghostscript/ghostscript_9.05.bb b/meta/recipes-extended/ghostscript/ghostscript_9.05.bb
index 93c503fb74..9ec57120b6 100644
--- a/meta/recipes-extended/ghostscript/ghostscript_9.05.bb
+++ b/meta/recipes-extended/ghostscript/ghostscript_9.05.bb
@@ -15,7 +15,7 @@ SECTION = "console/utils"
15LICENSE = "GPLv3" 15LICENSE = "GPLv3"
16LIC_FILES_CHKSUM = "file://LICENSE;md5=c5326026692dbed183f0558f926580f8" 16LIC_FILES_CHKSUM = "file://LICENSE;md5=c5326026692dbed183f0558f926580f8"
17 17
18PR = "r5" 18PR = "r6"
19 19
20DEPENDS = "ghostscript-native tiff jpeg fontconfig cups" 20DEPENDS = "ghostscript-native tiff jpeg fontconfig cups"
21DEPENDS_class-native = "" 21DEPENDS_class-native = ""
@@ -63,6 +63,13 @@ do_configure_prepend () {
63 if [ -e ${WORKDIR}/objarch.h ]; then 63 if [ -e ${WORKDIR}/objarch.h ]; then
64 cp ${WORKDIR}/objarch.h obj/arch.h 64 cp ${WORKDIR}/objarch.h obj/arch.h
65 fi 65 fi
66 if [ ${SITEINFO_ENDIANNESS} = "le" ]; then
67 export LCMS_BIGENDIAN="0"
68 export LCMS2_BIGENDIAN="0"
69 else
70 export LCMS_BIGENDIAN="1"
71 export LCMS2_BIGENDIAN="1"
72 fi
66} 73}
67 74
68do_configure_append () { 75do_configure_append () {