diff options
| author | Jesse Zhang <sen.zhang@windriver.com> | 2013-01-06 09:56:19 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-02-08 14:46:12 +0000 |
| commit | 0a07ec7d13becc7ce87c502e75a006300a7090a5 (patch) | |
| tree | 2b0b882ede1fa31e115b9871694b0a2d775cdce6 | |
| parent | 7d775b071b902ee0de6391b2c30d36e3003643e1 (diff) | |
| download | openembedded-core-0a07ec7d13becc7ce87c502e75a006300a7090a5.tar.gz openembedded-core-0a07ec7d13becc7ce87c502e75a006300a7090a5.tar.bz2 openembedded-core-0a07ec7d13becc7ce87c502e75a006300a7090a5.zip | |
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.
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>
| -rw-r--r-- | meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.05-NOT-check-endian.patch | 40 | ||||
| -rw-r--r-- | meta/recipes-extended/ghostscript/ghostscript_9.05.bb | 9 |
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. Upstream-Status: Pending Signed-off-by: Kang Kai <kai.kang@windriver.com> +Signed-off-by: Sen Zhang <sen.zhang@windriver.com> ---- ghostscript-9.05/base/configure.ac.orig 2012-03-14 15:28:30.828956872 +0800 -+++ ghostscript-9.05/base/configure.ac 2012-03-14 15:29:05.060957357 +0800 -@@ -1739,25 +1739,25 @@ - dnl check for big/little endian for LCMS - dnl -------------------------------------------------- +--- ghostscript-9.05/base/configure.ac.orig 2013-01-06 10:02:08.699479511 +0800 ++++ ghostscript-9.05/base/configure.ac 2013-01-06 10:01:52.275382106 +0800 +@@ -1741,13 +1741,13 @@ + + AC_MSG_CHECKING([for big endian]) --AC_MSG_CHECKING([for big endian]) -- -AC_RUN_IFELSE( - [AC_LANG_PROGRAM([#include <stdio.h>], [ - static const int one = 1; @@ -20,18 +19,6 @@ Signed-off-by: Kang Kai <kai.kang@windriver.com> - ])], - [LCMS_BIGENDIAN=1], - [LCMS_BIGENDIAN=0]) -- --if test "x$LCMS_BIGENDIAN" != "x0"; then -- LCMS_ENDIAN="-DUSE_BIG_ENDIAN=$LCMS_BIGENDIAN" -- LCMS2_ENDIAN="-DCMS_USE_BIG_ENDIAN=$LCMS_BIGENDIAN" -- AC_MSG_RESULT(yes) --else -- LCMS_ENDIAN= -- LCMS2_ENDIAN= -- AC_MSG_RESULT(no) --fi -+dnl AC_MSG_CHECKING([for big endian]) -+dnl +dnl AC_RUN_IFELSE( +dnl [AC_LANG_PROGRAM([#include <stdio.h>], [ +dnl static const int one = 1; @@ -39,16 +26,7 @@ Signed-off-by: Kang Kai <kai.kang@windriver.com> +dnl ])], +dnl [LCMS_BIGENDIAN=1], +dnl [LCMS_BIGENDIAN=0]) -+dnl -+dnl if test "x$LCMS_BIGENDIAN" != "x0"; then -+dnl LCMS_ENDIAN="-DUSE_BIG_ENDIAN=$LCMS_BIGENDIAN" -+dnl LCMS2_ENDIAN="-DCMS_USE_BIG_ENDIAN=$LCMS_BIGENDIAN" -+dnl AC_MSG_RESULT(yes) -+dnl else -+dnl LCMS_ENDIAN= -+dnl LCMS2_ENDIAN= -+dnl AC_MSG_RESULT(no) -+dnl fi - - AC_SUBST(LCMS_ENDIAN) + if test "x$LCMS_BIGENDIAN" != "x0"; then + LCMS_ENDIAN="-DUSE_BIG_ENDIAN=$LCMS_BIGENDIAN" + 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" LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://LICENSE;md5=c5326026692dbed183f0558f926580f8" -PR = "r5" +PR = "r6" DEPENDS = "ghostscript-native tiff jpeg fontconfig cups" DEPENDS_class-native = "" @@ -63,6 +63,13 @@ do_configure_prepend () { if [ -e ${WORKDIR}/objarch.h ]; then cp ${WORKDIR}/objarch.h obj/arch.h fi + if [ ${SITEINFO_ENDIANNESS} = "le" ]; then + export LCMS_BIGENDIAN="0" + export LCMS2_BIGENDIAN="0" + else + export LCMS_BIGENDIAN="1" + export LCMS2_BIGENDIAN="1" + fi } do_configure_append () { |