Bug 838165 - Cleanup in NSPR hooking in the build system. r=ted
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 14 Feb 2013 08:25:43 +0100
changeset 121843 e0518551f00eca62517f9ad43badd561f1179351
parent 121842 56c59c6542c8cdeeecf68acec15d7aa3a3729754
child 121844 1651dcb623970c926068956c27efa82f6d3e95ea
push id22958
push usermh@glandium.org
push dateThu, 14 Feb 2013 07:26:32 +0000
treeherdermozilla-inbound@e0518551f00e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs838165
milestone21.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 838165 - Cleanup in NSPR hooking in the build system. r=ted
config/nspr/Makefile.in
config/nspr/build.mk
modules/libbz2/src/Makefile.in
modules/libmar/src/Makefile.in
toolkit/toolkit-tiers.mk
tools/update-packaging/build.mk
--- a/config/nspr/Makefile.in
+++ b/config/nspr/Makefile.in
@@ -27,13 +27,8 @@ libs::
 	$(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 # }
-
-install::
-	$(MAKE) -C $(DEPTH)/nsprpub install DESTDIR=$(DESTDIR) libdir=$(mozappdir) includedir=$(includedir)/nspr
-	$(RM) -f $(addprefix $(DESTDIR)$(mozappdir)/$(LIB_PREFIX), $(addsuffix .$(LIB_SUFFIX), nspr4 plds4 plc4))
-	$(RM) -f $(addprefix $(DESTDIR)$(bindir)/,nspr-config compile-et.pl prerr.properties)
deleted file mode 100644
--- a/config/nspr/build.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-TIERS += nspr
-
-ifndef MOZ_NATIVE_NSPR
-tier_nspr_staticdirs += nsprpub
-tier_nspr_dirs += config/nspr
-endif
--- a/modules/libbz2/src/Makefile.in
+++ b/modules/libbz2/src/Makefile.in
@@ -38,18 +38,12 @@ CSRCS		= \
 HOST_CSRCS	= $(CSRCS)
 
 EXPORTS		= \
 		bzlib.h \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
-ifdef CROSS_COMPILE
-ifdef HOST_NSPR_MDCPUCFG
-HOST_CFLAGS    += -DMDCPUCFG=$(HOST_NSPR_MDCPUCFG)
-endif
-endif
-
 # The intermediate (.ii/.s) files for host and target can have the same name...
 # disable parallel builds
 .NOTPARALLEL:
 
--- a/modules/libmar/src/Makefile.in
+++ b/modules/libmar/src/Makefile.in
@@ -34,17 +34,11 @@ CSRCS		= \
 
 EXPORTS		= \
 		mar.h \
 		mar_cmdline.h \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
-ifdef CROSS_COMPILE
-ifdef HOST_NSPR_MDCPUCFG
-HOST_CFLAGS     += -DMDCPUCFG=$(HOST_NSPR_MDCPUCFG)
-endif
-endif
-
 # The intermediate (.ii/.s) files for host and target can have the same name...
 # disable parallel builds
 .NOTPARALLEL:
--- a/toolkit/toolkit-tiers.mk
+++ b/toolkit/toolkit-tiers.mk
@@ -1,17 +1,23 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ifdef LIBXUL_SDK
 $(error toolkit-tiers.mk is not compatible with --enable-libxul-sdk=)
 endif
 
-include $(topsrcdir)/config/nspr/build.mk
+TIERS += nspr
+
+ifndef MOZ_NATIVE_NSPR
+tier_nspr_staticdirs += nsprpub
+tier_nspr_dirs += config/nspr
+endif
+
 include $(topsrcdir)/config/js/build.mk
 
 TIERS += platform
 
 ifdef NS_TRACE_MALLOC
 tier_platform_dirs = tools/trace-malloc/lib
 endif
 
--- a/tools/update-packaging/build.mk
+++ b/tools/update-packaging/build.mk
@@ -1,13 +1,11 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-include $(topsrcdir)/config/nspr/build.mk
-
 TIERS += app
 
 tier_app_dirs += \
 	modules/libbz2 \
 	modules/libmar \
 	other-licenses/bsdiff \
 	$(NULL)