summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2014-09-09 16:15:11 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-09-10 15:38:57 +0100
commitbd1a3ab8a63d6b2c109d595c67fcca99817e1daa (patch)
tree797abc666dc84a45afb08b2a21c548f13d6d785c
parent9f9476fff147ba8e23b7302fd347378f76f133a8 (diff)
downloadpoky-bd1a3ab8a63d6b2c109d595c67fcca99817e1daa.tar.gz
nspr: Upgrade to 4.10.7
Remove patch that was directly modifing the configure script since we can now use autoreconf to configure. This also allowed for the removal of the do_configure() functions. Added patch to remove an undefined ${srcdir}. (From OE-Core rev: 622ad8482b55957f4a08eadf0131b0eb86d1886b) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch31
-rw-r--r--meta/recipes-support/nspr/nspr/remove-srcdir-from-configure-in.patch19
-rw-r--r--meta/recipes-support/nspr/nspr/trickly-fix-build-on-x86_64.patch62
-rw-r--r--meta/recipes-support/nspr/nspr_4.10.7.bb (renamed from meta/recipes-support/nspr/nspr_4.10.3.bb)13
4 files changed, 38 insertions, 87 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
index a6fa1ea607..c2b7258e50 100644
--- a/meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch
+++ b/meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch
@@ -11,23 +11,27 @@ Upstream-Status: Pending
11 configure.in | 12 ++++++------ 11 configure.in | 12 ++++++------
12 1 files changed, 6 insertions(+), 6 deletions(-) 12 1 files changed, 6 insertions(+), 6 deletions(-)
13 13
14diff --git a/configure.in b/configure.in 14Index: nspr/configure.in
15index 39c96a3..99a03ac 100644 15===================================================================
16--- a/configure.in 16--- nspr.orig/configure.in
17+++ b/configure.in 17+++ nspr/configure.in
18@@ -1778,24 +1778,24 @@ tools are selected during the Xcode/Developer Tools installation.]) 18@@ -1875,28 +1875,24 @@ tools are selected during the Xcode/Deve
19 PR_MD_ASFILES=os_Linux_ia64.s 19 PR_MD_ASFILES=os_Linux_ia64.s
20 ;; 20 ;;
21 x86_64) 21 x86_64)
22- if test -n "$USE_64"; then 22- if test -n "$USE_64"; then
23- PR_MD_ASFILES=os_Linux_x86_64.s 23- PR_MD_ASFILES=os_Linux_x86_64.s
24- else 24- elif test -n "$USE_X32"; then
25+ if test -n "$USE_N32"; then 25+ if test -n "$USE_X32"; then
26 AC_DEFINE(i386) 26+ AC_DEFINE(i386)
27 PR_MD_ASFILES=os_Linux_x86.s 27 PR_MD_ASFILES=os_Linux_x86_64.s
28 CC="$CC -m32" 28 CC="$CC -mx32"
29 CXX="$CXX -m32" 29 CXX="$CXX -mx32"
30+ else 30 else
31- AC_DEFINE(i386)
32- PR_MD_ASFILES=os_Linux_x86.s
33- CC="$CC -m32"
34- CXX="$CXX -m32"
31+ PR_MD_ASFILES=os_Linux_x86_64.s 35+ PR_MD_ASFILES=os_Linux_x86_64.s
32 fi 36 fi
33 ;; 37 ;;
@@ -46,6 +50,3 @@ index 39c96a3..99a03ac 100644
46 fi 50 fi
47 ;; 51 ;;
48 m68k) 52 m68k)
49--
501.7.1
51
diff --git a/meta/recipes-support/nspr/nspr/remove-srcdir-from-configure-in.patch b/meta/recipes-support/nspr/nspr/remove-srcdir-from-configure-in.patch
new file mode 100644
index 0000000000..bde715c5dc
--- /dev/null
+++ b/meta/recipes-support/nspr/nspr/remove-srcdir-from-configure-in.patch
@@ -0,0 +1,19 @@
1the $srcdir is not defined at the time of gnu-configurize.
2
3Upstream-Status: Inappropriate [OE-Core specific]
4
5Signed-off-by: Saul Wold <sgw@linux.intel.com>
6
7Index: nspr/configure.in
8===================================================================
9--- nspr.orig/configure.in
10+++ nspr/configure.in
11@@ -8,7 +8,7 @@ AC_PREREQ(2.61)
12 AC_INIT
13 AC_CONFIG_SRCDIR([pr/include/nspr.h])
14
15-AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf)
16+AC_CONFIG_AUX_DIR(build/autoconf)
17 AC_CANONICAL_TARGET
18
19 dnl ========================================================
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
deleted file mode 100644
index 8ca51e4d1f..0000000000
--- a/meta/recipes-support/nspr/nspr/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
diff --git a/meta/recipes-support/nspr/nspr_4.10.3.bb b/meta/recipes-support/nspr/nspr_4.10.7.bb
index 60e1bfa7b1..69e9dfa6a3 100644
--- a/meta/recipes-support/nspr/nspr_4.10.3.bb
+++ b/meta/recipes-support/nspr/nspr_4.10.7.bb
@@ -8,14 +8,13 @@ SECTION = "libs/network"
8SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/nspr-${PV}.tar.gz \ 8SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/nspr-${PV}.tar.gz \
9 file://remove-rpath-from-tests.patch \ 9 file://remove-rpath-from-tests.patch \
10 file://fix-build-on-x86_64.patch \ 10 file://fix-build-on-x86_64.patch \
11 file://trickly-fix-build-on-x86_64.patch \ 11 file://remove-srcdir-from-configure-in.patch \
12 file://nspr-CVE-2014-1545.patch \
13 " 12 "
14 13
15SRC_URI += "file://nspr.pc.in" 14SRC_URI += "file://nspr.pc.in"
16 15
17SRC_URI[md5sum] = "bf298e874cf454a3c2f8fe7e671c5d2e" 16SRC_URI[md5sum] = "6e06919e4b56efed501e05d8b45ec10e"
18SRC_URI[sha256sum] = "f25779b1a665dab0090b9c977dc6c29a63320f442956ed78629b66b405cb01e5" 17SRC_URI[sha256sum] = "389af5cfa863ea9bc6de7b30c15f8a4f9bddd8002f8c6fdc8b33caef43893938"
19 18
20S = "${WORKDIR}/nspr-${PV}/nspr" 19S = "${WORKDIR}/nspr-${PV}/nspr"
21 20
@@ -141,12 +140,6 @@ TESTS = "runtests.pl \
141 140
142inherit autotools-brokensep 141inherit autotools-brokensep
143 142
144do_configure() {
145 gnu-configize --force
146 mv config.sub config.guess build/autoconf
147 oe_runconf
148}
149
150do_compile_prepend() { 143do_compile_prepend() {
151 oe_runmake CROSS_COMPILE=1 CFLAGS="-DXP_UNIX" LDFLAGS="" CC=gcc -C config export 144 oe_runmake CROSS_COMPILE=1 CFLAGS="-DXP_UNIX" LDFLAGS="" CC=gcc -C config export
152} 145}