From 622ad8482b55957f4a08eadf0131b0eb86d1886b 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}. Signed-off-by: Saul Wold --- .../nspr/nspr/trickly-fix-build-on-x86_64.patch | 62 ---------------------- 1 file changed, 62 deletions(-) delete mode 100644 meta/recipes-support/nspr/nspr/trickly-fix-build-on-x86_64.patch (limited to 'meta/recipes-support/nspr/nspr/trickly-fix-build-on-x86_64.patch') 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 1.2.3-korg