summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/nspr/files/trickly-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/files/trickly-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/files/trickly-fix-build-on-x86_64.patch')
-rw-r--r--meta/recipes-support/nspr/files/trickly-fix-build-on-x86_64.patch62
1 files changed, 0 insertions, 62 deletions
diff --git a/meta/recipes-support/nspr/files/trickly-fix-build-on-x86_64.patch b/meta/recipes-support/nspr/files/trickly-fix-build-on-x86_64.patch
deleted file mode 100644
index 8ca51e4d1f..0000000000
--- a/meta/recipes-support/nspr/files/trickly-fix-build-on-x86_64.patch
+++ /dev/null
@@ -1,62 +0,0 @@
1trickily fix build failure on x86_64
2
3It seems that we can not run the 'autoreconf -f -i' for the nspr, I met
4several strange problems while trying to do that, and the previous
5author seemed had noticed this, so he wrote:
6
7do_configure() {
8 oe_runconf
9}
10
11to avoid running the "autoreconf". But we must modify configure.in to
12fix the build failure on x86_64, so both modify configure and
13configure.in, once the "autoreconf" can work correctly, we can remove
14this patch.
15
16Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
17
18Upstream-Status: Inappropriate [configuration]
19---
20 configure | 12 ++++++------
21 1 files changed, 6 insertions(+), 6 deletions(-)
22
23diff --git a/configure b/configure
24--- a/configure
25+++ b/configure
26@@ -4366,9 +4366,7 @@ EOF
27 PR_MD_ASFILES=os_Linux_ia64.s
28 ;;
29 x86_64)
30- if test -n "$USE_64"; then
31- PR_MD_ASFILES=os_Linux_x86_64.s
32- else
33+ if test -n "$USE_N32"; then
34 cat >> confdefs.h <<\EOF
35 #define i386 1
36 EOF
37@@ -4376,17 +4374,19 @@ EOF
38 PR_MD_ASFILES=os_Linux_x86.s
39 CC="$CC -m32"
40 CXX="$CXX -m32"
41+ else
42+ PR_MD_ASFILES=os_Linux_x86_64.s
43 fi
44 ;;
45 ppc|powerpc)
46 PR_MD_ASFILES=os_Linux_ppc.s
47 ;;
48 powerpc64)
49- if test -n "$USE_64"; then
50+ if test -n "$USE_N32"; then
51+ PR_MD_ASFILES=os_Linux_ppc.s
52+ else
53 CC="$CC -m64"
54 CXX="$CXX -m64"
55- else
56- PR_MD_ASFILES=os_Linux_ppc.s
57 fi
58 ;;
59 m68k)
60--
611.7.1
62