Bug 813241: Update config/system-headers and make wrapping of NSPR & NSS headers more robust, r=glandium
authorBrian Smith <bsmith@mozilla.com>
Thu, 22 Nov 2012 11:15:01 -0800
changeset 123524 8a9dc4387c9ce9aef7eef141a2af842222e4d8f1
parent 123523 9131874bd80306f3b8dfc97d03edcfa013a9acd3
child 123525 1ca9218271b962b16826d9583081a8ee970be821
push id2151
push userlsblakk@mozilla.com
push dateTue, 19 Feb 2013 18:06:57 +0000
treeherdermozilla-beta@4952e88741ec [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs813241
milestone20.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 813241: Update config/system-headers and make wrapping of NSPR & NSS headers more robust, r=glandium
config/nspr/Makefile.in
config/system-headers
js/src/config/system-headers
media/webrtc/trunk/src/modules/video_capture/main/source/video_capture.gypi
security/build/Makefile.in
--- a/config/nspr/Makefile.in
+++ b/config/nspr/Makefile.in
@@ -18,17 +18,17 @@ endif
 ifdef MOZ_NATIVE_NSPR
 $(error config/nspr/Makefile.in is not compatible with MOZ_NATIVE_NSPR)
 endif
 
 # Copy NSPR to the SDK
 ABS_DIST = $(call core_abspath,$(DIST))
 
 libs::
-	$(MAKE) -C $(DEPTH)/nsprpub install prefix=$(ABS_DIST)/sdk exec_prefix=$(ABS_DIST)/sdk bindir=$(ABS_DIST)/sdk/dummy includedir=$(ABS_DIST)/include libdir=$(ABS_DIST)/sdk/lib datadir=$(ABS_DIST)/sdk/dummy DESTDIR=
+	$(MAKE) -C $(DEPTH)/nsprpub install prefix=$(ABS_DIST)/sdk exec_prefix=$(ABS_DIST)/sdk bindir=$(ABS_DIST)/sdk/dummy includedir=$(ABS_DIST)/include/nspr libdir=$(ABS_DIST)/sdk/lib datadir=$(ABS_DIST)/sdk/dummy DESTDIR=
 	$(INSTALL) $(DEPTH)/nsprpub/config/nspr-config $(DIST)/sdk/bin
 	$(RM) -rf $(DIST)/sdk/dummy
 ifneq (,$(filter OS2 WINNT,$(OS_ARCH))) # {
 	$(RM) -f $(DIST)/sdk/lib/$(DLL_PREFIX)nspr4$(DLL_SUFFIX) $(DIST)/sdk/lib/$(DLL_PREFIX)plc4$(DLL_SUFFIX) $(DIST)/sdk/lib/$(DLL_PREFIX)plds4$(DLL_SUFFIX)
 	$(RM) -f $(DIST)/sdk/lib/$(LIB_PREFIX)nspr4_s.$(LIB_SUFFIX) $(DIST)/sdk/lib/$(LIB_PREFIX)plc4_s.$(LIB_SUFFIX) $(DIST)/sdk/lib/$(LIB_PREFIX)plds4_s.$(LIB_SUFFIX)
 else # } {
 	$(RM) -f $(DIST)/sdk/lib/$(LIB_PREFIX)nspr4.$(LIB_SUFFIX) $(DIST)/sdk/lib/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) $(DIST)/sdk/lib/$(LIB_PREFIX)plds4.$(LIB_SUFFIX)
 endif # }
--- a/config/system-headers
+++ b/config/system-headers
@@ -1,8 +1,151 @@
+nspr.h
+plarena.h
+plarenas.h
+plbase64.h
+plerror.h
+plgetopt.h
+plhash.h
+plstr.h
+pratom.h
+prbit.h
+prclist.h
+prcmon.h
+prcountr.h
+prcpucfg.h
+prcvar.h
+prdtoa.h
+prenv.h
+prerr.h
+prerror.h
+prinet.h
+prinit.h
+prinrval.h
+prio.h
+pripcsem.h
+private
+prlink.h
+prlock.h
+prlog.h
+prlong.h
+prmem.h
+prmon.h
+prmwait.h
+prnetdb.h
+prolock.h
+prpdce.h
+prprf.h
+prproces.h
+prrng.h
+prrwlock.h
+prshm.h
+prshma.h
+prsystem.h
+prthread.h
+prtime.h
+prtpool.h
+prtrace.h
+prtypes.h
+prvrsion.h
+prwin16.h
+base64.h
+blapit.h
+cert.h
+certdb.h
+certt.h
+ciferfam.h
+cmmf.h
+cmmft.h
+cms.h
+cmsreclist.h
+cmst.h
+crmf.h
+crmft.h
+cryptohi.h
+cryptoht.h
+ecl-exp.h
+hasht.h
+jar-ds.h
+jar.h
+jarfile.h
+key.h
+keyhi.h
+keyt.h
+keythi.h
+nss.h
+nssb64.h
+nssb64t.h
+nssbase.h
+nssbaset.h
+nssck.api
+nssckbi.h
+nssckepv.h
+nssckft.h
+nssckfw.h
+nssckfwc.h
+nssckfwt.h
+nssckg.h
+nssckmdt.h
+nssckt.h
+nssilckt.h
+nssilock.h
+nsslocks.h
+nssrwlk.h
+nssrwlkt.h
+nssutil.h
+ocsp.h
+ocspt.h
+p12.h
+p12plcy.h
+p12t.h
+pk11func.h
+pk11pqg.h
+pk11priv.h
+pk11pub.h
+pk11sdr.h
+pkcs11.h
+pkcs11f.h
+pkcs11n.h
+pkcs11p.h
+pkcs11t.h
+pkcs11u.h
+pkcs12.h
+pkcs12t.h
+pkcs7t.h
+portreg.h
+preenc.h
+secasn1.h
+secasn1t.h
+seccomon.h
+secder.h
+secdert.h
+secdig.h
+secdigt.h
+secerr.h
+sechash.h
+secitem.h
+secmime.h
+secmod.h
+secmodt.h
+secoid.h
+secoidt.h
+secpkcs5.h
+secpkcs7.h
+secport.h
+shsign.h
+smime.h
+ssl.h
+sslerr.h
+sslproto.h
+sslt.h
+utilmodt.h
+utilpars.h
+utilparst.h
+utilrename.h
 A4Stuff.h
 activscp.h
 AEDataModel.h
 AEObjects.h
 AEPackObject.h
 AERegistry.h
 AEUtils.h
 afxcmn.h
@@ -143,17 +286,16 @@ callconv.h
 Carbon/Carbon.h
 CarbonEvents.h
 Carbon.h
 cassert
 c_asm.h
 cctype
 cderr.h
 cerrno
-cert.h
 CFBase.h
 CFBundle.h
 CFData.h
 CFDictionary.h
 cf.h
 CFNumber.h
 CFPlugIn.h
 CFPreferences.h
@@ -323,34 +465,30 @@ iodef.h
 io.h
 IOKit/IOKitLib.h
 IOKit/IOMessage.h
 IOKit/pwr_mgt/IOPMLib.h
 iomanip
 iostream
 iostream.h
 iterator
-jar.h
 JavaControl.h
 JavaEmbedding/JavaControl.h
 JavaVM/jni.h
 jemalloc.h
 JManager.h
 JNIEnvTests.h
 jni.h
 #if MOZ_NATIVE_JPEG==1
 jpeglib.h
 #endif
 JVMManagerTests.h
 Kerberos/Kerberos.h
 kernel/image.h
 kernel/OS.h
-key.h
-keyt.h
-keythi.h
 LAction.h
 langinfo.h
 LApplication.h
 LArray.h
 LArrayIterator.h
 LAttachable.h
 LAttachment.h
 LaunchServices.h
@@ -522,18 +660,16 @@ net/if.h
 netinet/in.h
 netinet/in_systm.h
 netinet/tcp.h
 new
 newexe.h
 new.h
 nl_types.h
 NodeInfo.h
-nss.h
-nssilock.h
 nsswitch.h
 objbase.h
 objidl.h
 Objsafe.h
 ojiapitests.h
 ole2.h
 oleidl.h
 OpenGL/OpenGL.h
@@ -558,19 +694,16 @@ pango/pangoxft.h
 pango/pango-utils.h
 pascal.h
 Patches.h
 Path.h
 pcfs/pc_dir.h
 Pgenerr.h
 PGenErr.h
 Ph.h
-pk11func.h
-pk11pub.h
-pkcs11t.h
 PLStringFuncs.h
 PMApplication.h
 pmddim.h
 poll.h
 Polygon.h
 portable.h
 Power.h
 PP_ClassHeaders.cp
@@ -620,20 +753,17 @@ rpcproxy.h
 rpc/types.h
 sane/sane.h
 sane/sanei.h
 sane/saneopts.h
 Scrap.h
 Screen.h
 Script.h
 ScrollBar.h
-seccomon.h
 sec.h
-secmod.h
-secmodt.h
 secrng.h
 security.h
 secutil.h
 semaphore.h
 servprov.h
 set
 setjmp.h
 SFNTLayoutTypes.h
@@ -648,19 +778,16 @@ SimpleGameSound.h
 SIOUX.h
 size_t.h
 sndio.h
 someincludefile.h
 Sound.h
 soundcard.h
 sqlite3.h
 ssdef.h
-sslerr.h
-ssl.h
-sslproto.h
 sstream
 stack
 StandardFile.h
 starlet.h
 stat.h
 statreg.cpp
 statreg.h
 stdarg.h
@@ -903,89 +1030,16 @@ X11/XKBlib.h
 X11/Xlib.h
 X11/Xlibint.h
 X11/Xlocale.h
 X11/Xos.h
 X11/Xutil.h
 xpt_struct.h
 xpt_xdr.h
 zmouse.h
-sslt.h
-smime.h
-cms.h
-sechash.h
-secoidt.h
-certdb.h
-secerr.h
-nssutil.h
-nssb64.h
-secasn1.h
-secder.h
-certt.h
-ocsp.h
-keyhi.h
-cryptohi.h
-crmf.h
-pk11pqg.h
-cmmf.h
-base64.h
-secdert.h
-secitem.h
-secmime.h
-nssckbi.h
-pkcs12.h
-p12plcy.h
-pk11sdr.h
-nspr.h
-pratom.h
-prbit.h
-prclist.h
-prcmon.h
-prcountr.h
-prcvar.h
-prdtoa.h
-prenv.h
-prerr.h
-prerror.h
-prinet.h
-prinit.h
-prinrval.h
-prio.h
-pripcsem.h
-prlink.h
-prlock.h
-prlog.h
-prlong.h
-prmem.h
-prmon.h
-prmwait.h
-prnetdb.h
-prolock.h
-prpdce.h
-prprf.h
-prproces.h
-prrng.h
-prrwlock.h
-prshm.h
-prshma.h
-prsystem.h
-prthread.h
-prtime.h
-prtpool.h
-prtrace.h
-prtypes.h
-prvrsion.h
-plbase64.h
-plerror.h
-plgetopt.h
-plresolv.h
-plstr.h
-plarenas.h
-plarena.h
-plhash.h
 speex/speex_resampler.h
 soundtouch/SoundTouch.h
 #if MOZ_NATIVE_PNG==1
 png.h
 #endif
 #if MOZ_NATIVE_ZLIB==1
 zlib.h
 #endif
--- a/js/src/config/system-headers
+++ b/js/src/config/system-headers
@@ -1,8 +1,151 @@
+nspr.h
+plarena.h
+plarenas.h
+plbase64.h
+plerror.h
+plgetopt.h
+plhash.h
+plstr.h
+pratom.h
+prbit.h
+prclist.h
+prcmon.h
+prcountr.h
+prcpucfg.h
+prcvar.h
+prdtoa.h
+prenv.h
+prerr.h
+prerror.h
+prinet.h
+prinit.h
+prinrval.h
+prio.h
+pripcsem.h
+private
+prlink.h
+prlock.h
+prlog.h
+prlong.h
+prmem.h
+prmon.h
+prmwait.h
+prnetdb.h
+prolock.h
+prpdce.h
+prprf.h
+prproces.h
+prrng.h
+prrwlock.h
+prshm.h
+prshma.h
+prsystem.h
+prthread.h
+prtime.h
+prtpool.h
+prtrace.h
+prtypes.h
+prvrsion.h
+prwin16.h
+base64.h
+blapit.h
+cert.h
+certdb.h
+certt.h
+ciferfam.h
+cmmf.h
+cmmft.h
+cms.h
+cmsreclist.h
+cmst.h
+crmf.h
+crmft.h
+cryptohi.h
+cryptoht.h
+ecl-exp.h
+hasht.h
+jar-ds.h
+jar.h
+jarfile.h
+key.h
+keyhi.h
+keyt.h
+keythi.h
+nss.h
+nssb64.h
+nssb64t.h
+nssbase.h
+nssbaset.h
+nssck.api
+nssckbi.h
+nssckepv.h
+nssckft.h
+nssckfw.h
+nssckfwc.h
+nssckfwt.h
+nssckg.h
+nssckmdt.h
+nssckt.h
+nssilckt.h
+nssilock.h
+nsslocks.h
+nssrwlk.h
+nssrwlkt.h
+nssutil.h
+ocsp.h
+ocspt.h
+p12.h
+p12plcy.h
+p12t.h
+pk11func.h
+pk11pqg.h
+pk11priv.h
+pk11pub.h
+pk11sdr.h
+pkcs11.h
+pkcs11f.h
+pkcs11n.h
+pkcs11p.h
+pkcs11t.h
+pkcs11u.h
+pkcs12.h
+pkcs12t.h
+pkcs7t.h
+portreg.h
+preenc.h
+secasn1.h
+secasn1t.h
+seccomon.h
+secder.h
+secdert.h
+secdig.h
+secdigt.h
+secerr.h
+sechash.h
+secitem.h
+secmime.h
+secmod.h
+secmodt.h
+secoid.h
+secoidt.h
+secpkcs5.h
+secpkcs7.h
+secport.h
+shsign.h
+smime.h
+ssl.h
+sslerr.h
+sslproto.h
+sslt.h
+utilmodt.h
+utilpars.h
+utilparst.h
+utilrename.h
 A4Stuff.h
 activscp.h
 AEDataModel.h
 AEObjects.h
 AEPackObject.h
 AERegistry.h
 AEUtils.h
 afxcmn.h
@@ -143,17 +286,16 @@ callconv.h
 Carbon/Carbon.h
 CarbonEvents.h
 Carbon.h
 cassert
 c_asm.h
 cctype
 cderr.h
 cerrno
-cert.h
 CFBase.h
 CFBundle.h
 CFData.h
 CFDictionary.h
 cf.h
 CFNumber.h
 CFPlugIn.h
 CFPreferences.h
@@ -323,34 +465,30 @@ iodef.h
 io.h
 IOKit/IOKitLib.h
 IOKit/IOMessage.h
 IOKit/pwr_mgt/IOPMLib.h
 iomanip
 iostream
 iostream.h
 iterator
-jar.h
 JavaControl.h
 JavaEmbedding/JavaControl.h
 JavaVM/jni.h
 jemalloc.h
 JManager.h
 JNIEnvTests.h
 jni.h
 #if MOZ_NATIVE_JPEG==1
 jpeglib.h
 #endif
 JVMManagerTests.h
 Kerberos/Kerberos.h
 kernel/image.h
 kernel/OS.h
-key.h
-keyt.h
-keythi.h
 LAction.h
 langinfo.h
 LApplication.h
 LArray.h
 LArrayIterator.h
 LAttachable.h
 LAttachment.h
 LaunchServices.h
@@ -522,18 +660,16 @@ net/if.h
 netinet/in.h
 netinet/in_systm.h
 netinet/tcp.h
 new
 newexe.h
 new.h
 nl_types.h
 NodeInfo.h
-nss.h
-nssilock.h
 nsswitch.h
 objbase.h
 objidl.h
 Objsafe.h
 ojiapitests.h
 ole2.h
 oleidl.h
 OpenGL/OpenGL.h
@@ -558,19 +694,16 @@ pango/pangoxft.h
 pango/pango-utils.h
 pascal.h
 Patches.h
 Path.h
 pcfs/pc_dir.h
 Pgenerr.h
 PGenErr.h
 Ph.h
-pk11func.h
-pk11pub.h
-pkcs11t.h
 PLStringFuncs.h
 PMApplication.h
 pmddim.h
 poll.h
 Polygon.h
 portable.h
 Power.h
 PP_ClassHeaders.cp
@@ -620,20 +753,17 @@ rpcproxy.h
 rpc/types.h
 sane/sane.h
 sane/sanei.h
 sane/saneopts.h
 Scrap.h
 Screen.h
 Script.h
 ScrollBar.h
-seccomon.h
 sec.h
-secmod.h
-secmodt.h
 secrng.h
 security.h
 secutil.h
 semaphore.h
 servprov.h
 set
 setjmp.h
 SFNTLayoutTypes.h
@@ -648,19 +778,16 @@ SimpleGameSound.h
 SIOUX.h
 size_t.h
 sndio.h
 someincludefile.h
 Sound.h
 soundcard.h
 sqlite3.h
 ssdef.h
-sslerr.h
-ssl.h
-sslproto.h
 sstream
 stack
 StandardFile.h
 starlet.h
 stat.h
 statreg.cpp
 statreg.h
 stdarg.h
@@ -903,89 +1030,16 @@ X11/XKBlib.h
 X11/Xlib.h
 X11/Xlibint.h
 X11/Xlocale.h
 X11/Xos.h
 X11/Xutil.h
 xpt_struct.h
 xpt_xdr.h
 zmouse.h
-sslt.h
-smime.h
-cms.h
-sechash.h
-secoidt.h
-certdb.h
-secerr.h
-nssutil.h
-nssb64.h
-secasn1.h
-secder.h
-certt.h
-ocsp.h
-keyhi.h
-cryptohi.h
-crmf.h
-pk11pqg.h
-cmmf.h
-base64.h
-secdert.h
-secitem.h
-secmime.h
-nssckbi.h
-pkcs12.h
-p12plcy.h
-pk11sdr.h
-nspr.h
-pratom.h
-prbit.h
-prclist.h
-prcmon.h
-prcountr.h
-prcvar.h
-prdtoa.h
-prenv.h
-prerr.h
-prerror.h
-prinet.h
-prinit.h
-prinrval.h
-prio.h
-pripcsem.h
-prlink.h
-prlock.h
-prlog.h
-prlong.h
-prmem.h
-prmon.h
-prmwait.h
-prnetdb.h
-prolock.h
-prpdce.h
-prprf.h
-prproces.h
-prrng.h
-prrwlock.h
-prshm.h
-prshma.h
-prsystem.h
-prthread.h
-prtime.h
-prtpool.h
-prtrace.h
-prtypes.h
-prvrsion.h
-plbase64.h
-plerror.h
-plgetopt.h
-plresolv.h
-plstr.h
-plarenas.h
-plarena.h
-plhash.h
 speex/speex_resampler.h
 soundtouch/SoundTouch.h
 #if MOZ_NATIVE_PNG==1
 png.h
 #endif
 #if MOZ_NATIVE_ZLIB==1
 zlib.h
 #endif
--- a/media/webrtc/trunk/src/modules/video_capture/main/source/video_capture.gypi
+++ b/media/webrtc/trunk/src/modules/video_capture/main/source/video_capture.gypi
@@ -11,16 +11,21 @@
     {
       'target_name': 'video_capture_module',
       'type': '<(library)',
       'dependencies': [
         'webrtc_utility',
         '<(webrtc_root)/common_video/common_video.gyp:webrtc_libyuv',
         '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
       ],
+
+      'cflags_mozilla': [
+        '$(NSPR_CFLAGS)',
+      ],
+
       'include_dirs': [
         '../interface',
         '../../../interface',
         '<(webrtc_root)/common_video/libyuv/include',
 # added for mozilla for use_system_libjpeg
         '$(DIST)/include',
       ],
       'direct_dependent_settings': {
--- a/security/build/Makefile.in
+++ b/security/build/Makefile.in
@@ -331,13 +331,13 @@ install::
 endef
 $(foreach lib,$(NSS_LIBS),$(eval $(call install_rules,$(lib))))
 
 libs::
 	$(INSTALL) -m 755 $(SDK_LIBS) $(DIST)/sdk/lib
 # NSS installs headers to dist/public and we want them in dist/include
 	$(NSINSTALL) -D $(DIST)/include/nss
 	(cd $(DIST)/public/nss && tar $(TAR_CREATE_FLAGS) - .) | \
-	  (cd $(DIST)/include && tar -xf -)
+	  (cd $(DIST)/include/nss && tar -xf -)
 
 endif # MOZ_NATIVE_NSS
 
 include $(topsrcdir)/config/rules.mk