[oe-commits] org.oe.dev Consider i386 when making XMLCALL as decl type.

[khem commit]

Consider i386 when making XMLCALL as decl type.
This fixes gdb build failures on x86_64 host machines.

Author: khem at openembedded.org
Branch: org.openembedded.dev
Revision: 6dacea380fa668d32b60a27a5d7857e58526d613
ViewMTN: http://monotone.openembedded.org/revision/info/6dacea380fa668d32b60a27a5d7857e58526d613
Files:
1
packages/expat/expat-1.95.7/expat-XMLCALL.patch
packages/expat/expat_1.95.7.bb
Diffs:

#
# mt diff -re5938f5291bafdf3188ca7bfd40205414eeedf51 -r6dacea380fa668d32b60a27a5d7857e58526d613
#
#
#
# add_file "packages/expat/expat-1.95.7/expat-XMLCALL.patch"
#  content [e07a8ca785a8e34a2046a9e1c6c149678c075099]
# 
# patch "packages/expat/expat_1.95.7.bb"
#  from [b363541991ae6ef17a3b808ae6aca538792d0e86]
#    to [4f7e003b18ab3fdac5996dea79ad59280959c533]
#
============================================================
--- packages/expat/expat-1.95.7/expat-XMLCALL.patch	e07a8ca785a8e34a2046a9e1c6c149678c075099
+++ packages/expat/expat-1.95.7/expat-XMLCALL.patch	e07a8ca785a8e34a2046a9e1c6c149678c075099
@@ -0,0 +1,17 @@
+---
+ lib/expat.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: expat-1.95.7/lib/expat.h
+===================================================================
+--- expat-1.95.7.orig/lib/expat.h	2008-07-31 15:56:39.000000000 -0700
++++ expat-1.95.7/lib/expat.h	2008-07-31 15:58:38.000000000 -0700
+@@ -45,7 +45,7 @@
+ #ifndef XMLCALL
+ #if defined(XML_USE_MSC_EXTENSIONS)
+ #define XMLCALL __cdecl
+-#elif defined(__GNUC__)
++#elif defined(__GNUC__) && defined(__i386) && !defined(__INTEL_COMPILER)
+ #define XMLCALL __attribute__((cdecl))
+ #else
+ /* For any platform which uses this definition and supports more than
============================================================
--- packages/expat/expat_1.95.7.bb	b363541991ae6ef17a3b808ae6aca538792d0e86
+++ packages/expat/expat_1.95.7.bb	4f7e003b18ab3fdac5996dea79ad59280959c533
@@ -1,7 +1,9 @@ require expat.inc
 require expat.inc
-PR = "r1"
+PR = "r2"
 
-SRC_URI += "file://autotools.patch;patch=1"
+SRC_URI += "file://autotools.patch;patch=1 \
+	    file://expat-XMLCALL.patch;patch=1 \
+	   "
 
 inherit lib_package