summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2013-11-04 14:39:14 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-11-08 17:25:37 +0000
commit217a8de624c077b1c84c7a5dc2fa43241c1a0440 (patch)
tree327191c8aa708a777b0989c8c97c6e25bd4af7e5 /meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch
parent41f55f4370a7efa358694ec6d067df6a1c6433d9 (diff)
downloadpoky-217a8de624c077b1c84c7a5dc2fa43241c1a0440.tar.gz
nspr: Update to 4.10.1
Move patch directory files to nspr (From OE-Core rev: 7227ce313586503c0939d0c916464e623ad9c238) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch')
-rw-r--r--meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch51
1 files changed, 51 insertions, 0 deletions
diff --git a/meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch b/meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch
new file mode 100644
index 0000000000..a6fa1ea607
--- /dev/null
+++ b/meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch
@@ -0,0 +1,51 @@
1Fix build failure on x86_64
2
3When the target_cpu is x86_64, we should assume that the pkg uses 64bit,
4only if USE_N32 is set, we can assume that the pkg uses 32bit. It used a
5opposite logic before.
6
7Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
8
9Upstream-Status: Pending
10---
11 configure.in | 12 ++++++------
12 1 files changed, 6 insertions(+), 6 deletions(-)
13
14diff --git a/configure.in b/configure.in
15index 39c96a3..99a03ac 100644
16--- a/configure.in
17+++ b/configure.in
18@@ -1778,24 +1778,24 @@ tools are selected during the Xcode/Developer Tools installation.])
19 PR_MD_ASFILES=os_Linux_ia64.s
20 ;;
21 x86_64)
22- if test -n "$USE_64"; then
23- PR_MD_ASFILES=os_Linux_x86_64.s
24- else
25+ if test -n "$USE_N32"; then
26 AC_DEFINE(i386)
27 PR_MD_ASFILES=os_Linux_x86.s
28 CC="$CC -m32"
29 CXX="$CXX -m32"
30+ else
31+ PR_MD_ASFILES=os_Linux_x86_64.s
32 fi
33 ;;
34 ppc|powerpc)
35 PR_MD_ASFILES=os_Linux_ppc.s
36 ;;
37 powerpc64)
38- if test -n "$USE_64"; then
39+ if test -n "$USE_N32"; then
40+ PR_MD_ASFILES=os_Linux_ppc.s
41+ else
42 CC="$CC -m64"
43 CXX="$CXX -m64"
44- else
45- PR_MD_ASFILES=os_Linux_ppc.s
46 fi
47 ;;
48 m68k)
49--
501.7.1
51