diff options
Diffstat (limited to 'meta/recipes-support/nspr/nspr/trickly-fix-build-on-x86_64.patch')
-rw-r--r-- | meta/recipes-support/nspr/nspr/trickly-fix-build-on-x86_64.patch | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/meta/recipes-support/nspr/nspr/trickly-fix-build-on-x86_64.patch b/meta/recipes-support/nspr/nspr/trickly-fix-build-on-x86_64.patch new file mode 100644 index 0000000000..8ca51e4d1f --- /dev/null +++ b/meta/recipes-support/nspr/nspr/trickly-fix-build-on-x86_64.patch | |||
@@ -0,0 +1,62 @@ | |||
1 | trickily fix build failure on x86_64 | ||
2 | |||
3 | It seems that we can not run the 'autoreconf -f -i' for the nspr, I met | ||
4 | several strange problems while trying to do that, and the previous | ||
5 | author seemed had noticed this, so he wrote: | ||
6 | |||
7 | do_configure() { | ||
8 | oe_runconf | ||
9 | } | ||
10 | |||
11 | to avoid running the "autoreconf". But we must modify configure.in to | ||
12 | fix the build failure on x86_64, so both modify configure and | ||
13 | configure.in, once the "autoreconf" can work correctly, we can remove | ||
14 | this patch. | ||
15 | |||
16 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
17 | |||
18 | Upstream-Status: Inappropriate [configuration] | ||
19 | --- | ||
20 | configure | 12 ++++++------ | ||
21 | 1 files changed, 6 insertions(+), 6 deletions(-) | ||
22 | |||
23 | diff --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 | -- | ||
61 | 1.7.1 | ||
62 | |||