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>

1 files changed, 16 insertions, 15 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
  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
-