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>
This commit is contained in:
Jesse Zhang
2013-01-06 09:56:19 +08:00
committed by Richard Purdie
parent 858646c7bd
commit 981bd3a297
2 changed files with 17 additions and 32 deletions

View File

@@ -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"

View File

@@ -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 () {