From bd1a3ab8a63d6b2c109d595c67fcca99817e1daa Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Tue, 9 Sep 2014 16:15:11 -0700 Subject: 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 Signed-off-by: Richard Purdie --- .../nspr/nspr/fix-build-on-x86_64.patch | 31 +++++------ .../nspr/remove-srcdir-from-configure-in.patch | 19 +++++++ .../nspr/nspr/trickly-fix-build-on-x86_64.patch | 62 ---------------------- 3 files changed, 35 insertions(+), 77 deletions(-) create mode 100644 meta/recipes-support/nspr/nspr/remove-srcdir-from-configure-in.patch delete mode 100644 meta/recipes-support/nspr/nspr/trickly-fix-build-on-x86_64.patch (limited to 'meta/recipes-support/nspr/nspr') 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 configure.in | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) -diff --git a/configure.in b/configure.in -index 39c96a3..99a03ac 100644 ---- a/configure.in -+++ b/configure.in -@@ -1778,24 +1778,24 @@ tools are selected during the Xcode/Developer Tools installation.]) +Index: nspr/configure.in +=================================================================== +--- nspr.orig/configure.in ++++ nspr/configure.in +@@ -1875,28 +1875,24 @@ tools are selected during the Xcode/Deve PR_MD_ASFILES=os_Linux_ia64.s ;; x86_64) - if test -n "$USE_64"; then - PR_MD_ASFILES=os_Linux_x86_64.s -- else -+ if test -n "$USE_N32"; then - AC_DEFINE(i386) - PR_MD_ASFILES=os_Linux_x86.s - CC="$CC -m32" - CXX="$CXX -m32" -+ else +- elif test -n "$USE_X32"; then ++ if test -n "$USE_X32"; then ++ AC_DEFINE(i386) + PR_MD_ASFILES=os_Linux_x86_64.s + CC="$CC -mx32" + CXX="$CXX -mx32" + else +- AC_DEFINE(i386) +- PR_MD_ASFILES=os_Linux_x86.s +- CC="$CC -m32" +- CXX="$CXX -m32" + PR_MD_ASFILES=os_Linux_x86_64.s fi ;; @@ -46,6 +50,3 @@ index 39c96a3..99a03ac 100644 fi ;; m68k) --- -1.7.1 - 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 @@ +the $srcdir is not defined at the time of gnu-configurize. + +Upstream-Status: Inappropriate [OE-Core specific] + +Signed-off-by: Saul Wold + +Index: nspr/configure.in +=================================================================== +--- nspr.orig/configure.in ++++ nspr/configure.in +@@ -8,7 +8,7 @@ AC_PREREQ(2.61) + AC_INIT + AC_CONFIG_SRCDIR([pr/include/nspr.h]) + +-AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf) ++AC_CONFIG_AUX_DIR(build/autoconf) + AC_CANONICAL_TARGET + + 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 @@ -trickily fix build failure on x86_64 - -It seems that we can not run the 'autoreconf -f -i' for the nspr, I met -several strange problems while trying to do that, and the previous -author seemed had noticed this, so he wrote: - -do_configure() { - oe_runconf -} - -to avoid running the "autoreconf". But we must modify configure.in to -fix the build failure on x86_64, so both modify configure and -configure.in, once the "autoreconf" can work correctly, we can remove -this patch. - -Signed-off-by: Robert Yang - -Upstream-Status: Inappropriate [configuration] ---- - configure | 12 ++++++------ - 1 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/configure b/configure ---- a/configure -+++ b/configure -@@ -4366,9 +4366,7 @@ EOF - PR_MD_ASFILES=os_Linux_ia64.s - ;; - x86_64) -- if test -n "$USE_64"; then -- PR_MD_ASFILES=os_Linux_x86_64.s -- else -+ if test -n "$USE_N32"; then - cat >> confdefs.h <<\EOF - #define i386 1 - EOF -@@ -4376,17 +4374,19 @@ EOF - PR_MD_ASFILES=os_Linux_x86.s - CC="$CC -m32" - CXX="$CXX -m32" -+ else -+ PR_MD_ASFILES=os_Linux_x86_64.s - fi - ;; - ppc|powerpc) - PR_MD_ASFILES=os_Linux_ppc.s - ;; - powerpc64) -- if test -n "$USE_64"; then -+ if test -n "$USE_N32"; then -+ PR_MD_ASFILES=os_Linux_ppc.s -+ else - CC="$CC -m64" - CXX="$CXX -m64" -- else -- PR_MD_ASFILES=os_Linux_ppc.s - fi - ;; - m68k) --- -1.7.1 - -- cgit v1.2.3-54-g00ecf