Commit 7e03f326 authored by Noemi Erli's avatar Noemi Erli
Browse files

Backed out 2 changesets (bug 1526010, bug 1520646) mass mochitest failures... 

Backed out 2 changesets (bug 1526010, bug 1520646) mass mochitest failures UPGRADE_NSPR_RELEASE CLOSED TREE

Backed out changeset 5b4cd1f37414 (bug 1520646)
Backed out changeset c7041aff5ad7 (bug 1526010)

--HG--
extra : amend_source : 8c92a1c912acbe67ce77861c0e6fedc5e127be05
parent 1c82c015

config/external/nspr/pr/moz.build

+3 −10
Original line number Diff line number Diff line
@@ -110,10 +110,6 @@ LOCAL_INCLUDES += [ 
]



SOURCES += [

    '/nsprpub/pr/src/io/prpolevt.c', # conflicting definition of PRFilePrivate

]



UNIFIED_SOURCES += [

    '/nsprpub/pr/src/io/prfdcach.c',

    '/nsprpub/pr/src/io/priometh.c',

    '/nsprpub/pr/src/io/pripv6.c',
@@ -122,6 +118,7 @@ UNIFIED_SOURCES += [ 
    '/nsprpub/pr/src/io/prmapopt.c',

    '/nsprpub/pr/src/io/prmmap.c',

    '/nsprpub/pr/src/io/prmwait.c',

    '/nsprpub/pr/src/io/prpolevt.c',

    '/nsprpub/pr/src/io/prprf.c',

    '/nsprpub/pr/src/io/prscanf.c',

    '/nsprpub/pr/src/io/prstdio.c',
@@ -161,7 +158,7 @@ UNIFIED_SOURCES += [ 


if CONFIG['OS_TARGET'] != 'WINNT':

    DEFINES['_PR_PTHREADS'] = True

    UNIFIED_SOURCES += [

    SOURCES += [

        '/nsprpub/pr/src/md/unix/unix.c',

        '/nsprpub/pr/src/md/unix/unix_errors.c',

        '/nsprpub/pr/src/md/unix/uxproces.c',
@@ -175,16 +172,12 @@ if CONFIG['OS_TARGET'] != 'WINNT': 
    ]

else:

    SOURCES += [

        # ntinrval.c needs windows.h without WIN32_LEAN_AND_MEAN, so it can't be

        # unified after any file that pulled in windows.h in lean-and-mean mode.

        '/nsprpub/pr/src/md/windows/ntinrval.c',

    ]

    UNIFIED_SOURCES += [

        '/nsprpub/pr/src/io/prdir.c',

        '/nsprpub/pr/src/io/prfile.c',

        '/nsprpub/pr/src/io/prio.c',

        '/nsprpub/pr/src/io/prsocket.c',

        '/nsprpub/pr/src/md/windows/ntgc.c',

        '/nsprpub/pr/src/md/windows/ntinrval.c',

        '/nsprpub/pr/src/md/windows/ntmisc.c',

        '/nsprpub/pr/src/md/windows/ntsec.c',

        '/nsprpub/pr/src/md/windows/ntsem.c',

nsprpub/TAG-INFO

+1 −1
Original line number Diff line number Diff line 
753fe0f7964c
 
NSPR_4_20_RTM

nsprpub/config/prdepend.h

+1 −0
Original line number Diff line number Diff line
@@ -10,3 +10,4 @@ 
 */



#error "Do not include this header file."

nsprpub/configure

+17 −2
Original line number Diff line number Diff line
@@ -783,6 +783,7 @@ with_android_ndk 
with_android_toolchain

with_android_version

with_android_platform

with_gonk

with_dist_prefix

with_dist_bindir

with_dist_includedir
@@ -872,7 +873,6 @@ datadir='${datarootdir}' 
sysconfdir='${prefix}/etc'

sharedstatedir='${prefix}/com'

localstatedir='${prefix}/var'



includedir='${prefix}/include'

oldincludedir='/usr/include'

docdir='${datarootdir}/doc/${PACKAGE}'
@@ -1484,6 +1484,7 @@ Optional Packages: 
                          Android platform version, default 5 for arm, 9 for x86/mips

  --with-android-platform=DIR

                          location of platform dir

  --with-gonk=DIR         location of gonk dir

  --with-dist-prefix=DIST_PREFIX

                          place build files in DIST_PREFIX dist

  --with-dist-bindir=DIR  build execuatables in DIR DIST_PREFIX/bin
@@ -2487,7 +2488,7 @@ test -n "$target_alias" && 
  program_prefix=${target_alias}-



MOD_MAJOR_VERSION=4

MOD_MINOR_VERSION=21

MOD_MINOR_VERSION=20

MOD_PATCH_VERSION=0

NSPR_MODNAME=nspr20

_HAVE_PTHREADS=
@@ -2655,6 +2656,19 @@ mipsel-*android*) 
    ;;

esac







# Check whether --with-gonk was given.

if test "${with_gonk+set}" = set; then :

  withval=$with_gonk; gonkdir=$withval

fi





if test -n "$gonkdir" ; then



    $as_echo "#define ANDROID 1" >>confdefs.h



else

case "$target" in

*-android*|*-linuxandroid*)

    if test -z "$android_ndk" ; then
@@ -2740,6 +2754,7 @@ $as_echo "$android_platform" >&6; } 


    ;;

esac

fi



dist_prefix='${MOD_DEPTH}/dist'

dist_bindir='${dist_prefix}/bin'

nsprpub/configure.in

+17 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ dnl ======================================================== 
dnl = Defaults

dnl ========================================================

MOD_MAJOR_VERSION=4

MOD_MINOR_VERSION=21

MOD_MINOR_VERSION=20

MOD_PATCH_VERSION=0

NSPR_MODNAME=nspr20

_HAVE_PTHREADS=
@@ -147,6 +147,21 @@ mipsel-*android*) 
    ;;

esac



dnl ========================================================

dnl = Gonk is a fork of Android used for Mozilla's B2G project.

dnl = Configuration is done largely by the top level config

dnl = and the specified gonk directory doesn't matter here.

dnl ========================================================



AC_ARG_WITH(gonk,

[  --with-gonk=DIR         location of gonk dir],

    gonkdir=$withval)



if test -n "$gonkdir" ; then

    dnl Most things are directly configured by env vars when building for gonk



    AC_DEFINE(ANDROID)

else

case "$target" in

*-android*|*-linuxandroid*)

    if test -z "$android_ndk" ; then
@@ -231,6 +246,7 @@ case "$target" in 
    AC_DEFINE(ANDROID)

    ;;

esac

fi



dnl ========================================================

dnl =