Bug 1530483 - Use UNIFIED_SOURCES in NSPR's moz.build r=glandium
authorDavid Major <dmajor@mozilla.com>
Tue, 26 Feb 2019 07:05:23 +0000
changeset 519044 a02ee3c332505e03c6e33e1ea30f07091064450d
parent 519043 d8ec58f95f80e67432601ad43e0ea492e9d09b73
child 519045 c68cc2526fbde767f1277da772664a485c45c4e9
push id10862
push userffxbld-merge
push dateMon, 11 Mar 2019 13:01:11 +0000
treeherdermozilla-beta@a2e7f5c935da [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1530483
milestone67.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 1530483 - Use UNIFIED_SOURCES in NSPR's moz.build r=glandium Differential Revision: https://phabricator.services.mozilla.com/D21060
config/external/nspr/pr/moz.build
--- a/config/external/nspr/pr/moz.build
+++ b/config/external/nspr/pr/moz.build
@@ -105,39 +105,42 @@ else:
 
 LOCAL_INCLUDES += [
     '/config/external/nspr',
     '/nsprpub/pr/include',
     '/nsprpub/pr/include/private',
 ]
 
 SOURCES += [
+    '/nsprpub/pr/src/io/prpolevt.c', # conflicting definition of PRFilePrivate
+    '/nsprpub/pr/src/misc/praton.c', # duplicate definition of index_hex
+    '/nsprpub/pr/src/misc/prcountr.c', # duplicate definition of QName, RName
+ ]
+
+UNIFIED_SOURCES += [
     '/nsprpub/pr/src/io/prfdcach.c',
     '/nsprpub/pr/src/io/priometh.c',
     '/nsprpub/pr/src/io/pripv6.c',
     '/nsprpub/pr/src/io/prlayer.c',
     '/nsprpub/pr/src/io/prlog.c',
     '/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',
     '/nsprpub/pr/src/linking/prlink.c',
     '/nsprpub/pr/src/malloc/prmalloc.c',
     '/nsprpub/pr/src/malloc/prmem.c',
     '/nsprpub/pr/src/md/prosdep.c',
     '/nsprpub/pr/src/memory/prseg.c',
     '/nsprpub/pr/src/memory/prshm.c',
     '/nsprpub/pr/src/memory/prshma.c',
     '/nsprpub/pr/src/misc/pralarm.c',
     '/nsprpub/pr/src/misc/pratom.c',
-    '/nsprpub/pr/src/misc/praton.c',
-    '/nsprpub/pr/src/misc/prcountr.c',
     '/nsprpub/pr/src/misc/prdtoa.c',
     '/nsprpub/pr/src/misc/prenv.c',
     '/nsprpub/pr/src/misc/prerr.c',
     '/nsprpub/pr/src/misc/prerror.c',
     '/nsprpub/pr/src/misc/prerrortable.c',
     '/nsprpub/pr/src/misc/prinit.c',
     '/nsprpub/pr/src/misc/prinrval.c',
     '/nsprpub/pr/src/misc/pripc.c',
@@ -153,41 +156,46 @@ SOURCES += [
     '/nsprpub/pr/src/misc/prtrace.c',
     '/nsprpub/pr/src/threads/prcmon.c',
     '/nsprpub/pr/src/threads/prrwlock.c',
     '/nsprpub/pr/src/threads/prtpd.c',
 ]
 
 if CONFIG['OS_TARGET'] != 'WINNT':
     DEFINES['_PR_PTHREADS'] = True
-    SOURCES += [
+    UNIFIED_SOURCES += [
         '/nsprpub/pr/src/md/unix/unix.c',
         '/nsprpub/pr/src/md/unix/unix_errors.c',
         '/nsprpub/pr/src/md/unix/uxproces.c',
         '/nsprpub/pr/src/md/unix/uxrng.c',
         '/nsprpub/pr/src/md/unix/uxshm.c',
         '/nsprpub/pr/src/md/unix/uxwrap.c',
         '/nsprpub/pr/src/pthreads/ptio.c',
         '/nsprpub/pr/src/pthreads/ptmisc.c',
         '/nsprpub/pr/src/pthreads/ptsynch.c',
         '/nsprpub/pr/src/pthreads/ptthread.c',
     ]
 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',
+        # w32poll.c needs a custom value of FD_SETSIZE for winsock.h.
+        '/nsprpub/pr/src/md/windows/w32poll.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/pr/src/md/windows/w32ipcsem.c',
-        '/nsprpub/pr/src/md/windows/w32poll.c',
         '/nsprpub/pr/src/md/windows/w32rng.c',
         '/nsprpub/pr/src/md/windows/w32shm.c',
         '/nsprpub/pr/src/md/windows/w95cv.c',
         '/nsprpub/pr/src/md/windows/w95dllmain.c',
         '/nsprpub/pr/src/md/windows/w95io.c',
         '/nsprpub/pr/src/md/windows/w95sock.c',
         '/nsprpub/pr/src/md/windows/w95thred.c',
         '/nsprpub/pr/src/md/windows/win32_errors.c',