Bug 1050086 - C-c needs a "port" of bug 1047267 r=jcranmer a=for CLOSED TREE
authorIan Neal <iann_cvs@blueyonder.co.uk>
Wed, 13 Aug 2014 22:04:31 +0100
changeset 20737 7ad2fba944f14b1beb4468bf583d2e3851844b47
parent 20736 7a18986c067151991f84deb11fcf98421cd1d8c4
child 20738 350e8c99b33c446bc421a831be1cab8e72f421b7
push id1234
push usermbanner@mozilla.com
push dateMon, 13 Oct 2014 17:59:18 +0000
treeherdercomm-beta@12633210f163 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjcranmer, for
bugs1050086, 1047267
Bug 1050086 - C-c needs a "port" of bug 1047267 r=jcranmer a=for CLOSED TREE
calendar/base/backend/libical/build/Makefile.in
calendar/base/backend/libical/build/moz.build
config/rules.mk
db/mork/build/Makefile.in
db/mork/build/moz.build
ldap/moz.build
ldap/xpcom/src/Makefile.in
ldap/xpcom/src/moz.build
mail/components/build/Makefile.in
mail/components/build/moz.build
mail/configure.in
mailnews/base/test/moz.build
mailnews/build/Makefile.in
mailnews/build/moz.build
mailnews/imap/test/Makefile.in
mailnews/imap/test/moz.build
mailnews/import/build/Makefile.in
mailnews/import/build/moz.build
suite/configure.in
suite/profile/Makefile.in
suite/profile/moz.build
--- a/calendar/base/backend/libical/build/Makefile.in
+++ b/calendar/base/backend/libical/build/Makefile.in
@@ -8,18 +8,16 @@ topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH   = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 USE_STATIC_LIBS = 1
 NO_COMPONENTS_MANIFEST = 1
 
-EXTRA_LIBS += $(NSPR_LIBS)
-
 include $(topsrcdir)/config/rules.mk
 
 # Ensure that we don't embed a manifest referencing the CRT
 EMBED_MANIFEST_AT =
 
 BACKEND_MANIFESTS = libical.manifest
 DEFINES += -DSHARED_LIBRARY=$(SHARED_LIBRARY) -DXPIDL_MODULE=$(XPIDL_MODULE)
 
--- a/calendar/base/backend/libical/build/moz.build
+++ b/calendar/base/backend/libical/build/moz.build
@@ -11,16 +11,17 @@ IS_COMPONENT = True
 
 LIBRARY_NAME = 'calbasecomps'
 LOCAL_INCLUDES += [
     '..'
 ]
 
 USE_LIBS += [
         'mozalloc',
+        'nspr',
         'xul',
     ]
 
 if CONFIG['JS_SHARED_LIBRARY']:
     USE_LIBS += [
         'js',
     ]
 
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -74,17 +74,16 @@ DIRS += $(TEST_DIRS)
 ifdef CPP_UNIT_TESTS
 ifdef COMPILE_ENVIRONMENT
 
 # Compile the tests to $(DIST)/bin.  Make lots of niceties available by default
 # through TestHarness.h, by modifying the list of includes and the libs against
 # which stuff links.
 SIMPLE_PROGRAMS += $(CPP_UNIT_TESTS)
 INCLUDES += -I$(DIST)/include/testing
-EXTRA_LIBS += $(NSPR_LIBS)
 
 ifndef MOZ_PROFILE_GENERATE
 CPP_UNIT_TESTS_FILES = $(CPP_UNIT_TESTS)
 CPP_UNIT_TESTS_DEST = $(DIST)/cppunittests
 CPP_UNIT_TESTS_TARGET = target
 INSTALL_TARGETS += CPP_UNIT_TESTS
 endif
 
@@ -512,17 +511,18 @@ ECHO := true
 QUIET := -q
 endif
 
 # Do everything from scratch
 everything::
 	$(MAKE) clean
 	$(MAKE) all
 
-STATIC_LIBS_DEPS := $(addsuffix .$(LIBS_DESC_SUFFIX),$(STATIC_LIBS))
+STATIC_LIB_DEP = $(if $(wildcard $(1).$(LIBS_DESC_SUFFIX)),$(1).$(LIBS_DESC_SUFFIX),$(1))
+STATIC_LIBS_DEPS := $(foreach l,$(STATIC_LIBS),$(call STATIC_LIB_DEP,$(l)))
 
 # Dependencies which, if modified, should cause everything to rebuild
 GLOBAL_DEPS += Makefile $(DEPTH)/config/autoconf.mk $(topsrcdir)/config/config.mk
 
 ##############################################
 ifdef COMPILE_ENVIRONMENT
 OBJ_TARGETS = $(OBJS) $(PROGOBJS) $(HOST_OBJS) $(HOST_PROGOBJS)
 
deleted file mode 100644
--- a/db/mork/build/Makefile.in
+++ /dev/null
@@ -1,18 +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/.
-
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
-srcdir		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-ifdef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-EXTRA_LIBS += $(NSPR_LIBS)
-endif
-
-include $(topsrcdir)/config/rules.mk
-
--- a/db/mork/build/moz.build
+++ b/db/mork/build/moz.build
@@ -14,16 +14,17 @@ SOURCES += [
 
 USE_LIBS += [
     'mozalloc',
 ]
 
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     IS_COMPONENT = True
     USE_LIBS += [
+        'nspr',
         'xpcomglue_s',
         'xul',
     ]
 else:
     FINAL_LIBRARY = 'xul'
 
 LIBRARY_NAME = 'mork'
 
--- a/ldap/moz.build
+++ b/ldap/moz.build
@@ -1,10 +1,21 @@
 # vim: set filetype=python:
 # 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/.
 
-# There needs to be an ldap/target entry in root.mk for the ldap libraries to
-# be built ahead of toolkit/library, so by adding a LIBRARY_NAME, it forces an
-# entry to be created. It is not currently used for anything other than
-# creating that entry.
 LIBRARY_NAME = 'ldapsdks'
+
+USE_LIBS += ['nspr']
+
+if CONFIG['OS_ARCH'] == 'WINNT':
+    USE_LIBS += [
+        '/ldap/sdks/c-sdk/ldap/libraries/libldap/nsldap32v60',
+        '/ldap/sdks/c-sdk/ldap/libraries/libldif/nsldif32v60',
+        '/ldap/sdks/c-sdk/ldap/libraries/libprldap/nsldappr32v60',
+    ]
+else:
+    USE_LIBS += [
+        '/ldap/sdks/c-sdk/ldap/libraries/libldap/ldap60',
+        '/ldap/sdks/c-sdk/ldap/libraries/libldif/ldif60',
+        '/ldap/sdks/c-sdk/ldap/libraries/libprldap/prldap60',
+    ]
--- a/ldap/xpcom/src/Makefile.in
+++ b/ldap/xpcom/src/Makefile.in
@@ -9,17 +9,12 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 ifdef MOZ_PREF_EXTENSIONS
 DEFINES += -DMOZ_PREF_EXTENSIONS
 endif
 
-EXTRA_LIBS += $(LDAP_LIBS)
-ifdef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-EXTRA_LIBS += $(NSPR_LIBS)
-endif
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES	= $(LDAP_CFLAGS)
 
--- a/ldap/xpcom/src/moz.build
+++ b/ldap/xpcom/src/moz.build
@@ -22,22 +22,24 @@ if CONFIG['MOZ_PREF_EXTENSIONS']:
     SOURCES += ['nsLDAPSyncQuery.cpp']
 
 EXTRA_COMPONENTS += [
     'ldapComponents.manifest',
     'nsLDAPProtocolHandler.js',
 ]
 
 USE_LIBS += [
+    'ldapsdks',
     'mozalloc',
 ]
 
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     IS_COMPONENT = True
     USE_LIBS += [
+        'nspr',
         'xpcomglue_s',
         'xul',
     ]
 # js needs to come after xul for now, because it is an archive and its content
 # is discarded when it comes first.
     USE_LIBS += [
         'js',
     ]
deleted file mode 100644
--- a/mail/components/build/Makefile.in
+++ /dev/null
@@ -1,16 +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/.
-
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-ifdef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-EXTRA_LIBS += $(NSPR_LIBS)
-endif
-
-include $(topsrcdir)/config/rules.mk
--- a/mail/components/build/moz.build
+++ b/mail/components/build/moz.build
@@ -11,16 +11,17 @@ USE_LIBS += [
     'mozalloc',
 ]
 
 # NOTE: if we switch away from LIBXUL_LIBRARY at any stage
 # we need to clear the EMBED_MANIFEST_AT flag. (See Bug 714495)
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     IS_COMPONENT = True
     USE_LIBS += [
+        'nspr',
         'unicharutil_external_s',
         'xpcomglue_s',
         'xul',
     ]
     OS_LIBS += CONFIG['GLIB_LIBS']
 else:
     FINAL_LIBRARY = 'xul'
 
--- a/mail/configure.in
+++ b/mail/configure.in
@@ -48,32 +48,21 @@ dnl = LDAP
 dnl =========================================================
 MOZ_ARG_DISABLE_BOOL(ldap,
 [  --disable-ldap          Disable LDAP support],
     MOZ_LDAP_XPCOM=,
     MOZ_LDAP_XPCOM=1)
 
 if test "$MOZ_LDAP_XPCOM"; then
     LDAP_CFLAGS='-I${DIST}/public/ldap'
-    if test "$OS_ARCH" = "WINNT"; then
-        if test -n "$GNU_CC"; then
-            LDAP_LIBS='-L$(DIST)/lib -lnsldap32v60 -lnsldappr32v60 -lnsldif32v60'
-        else
-            LDAP_LIBS='$(DIST)/lib/$(LIB_PREFIX)nsldap32v60.${IMPORT_LIB_SUFFIX} $(DIST)/lib/$(LIB_PREFIX)nsldappr32v60.${IMPORT_LIB_SUFFIX} $(DIST)/lib/$(LIB_PREFIX)nsldif32v60.${IMPORT_LIB_SUFFIX}'
-        fi
-    else
-        LDAP_LIBS='-L${DIST}/bin -L${DIST}/lib -lldap60 -lprldap60 -lldif60'
-    fi
-
     LDAP_MODULE="MODULE(nsLDAPProtocolModule)"
 fi
 
 AC_SUBST(MOZ_LDAP_XPCOM)
 AC_SUBST(LDAP_CFLAGS)
-AC_SUBST(LDAP_LIBS)
 
 dnl =========================================================
 dnl = MAPI support (Windows only)
 dnl =========================================================
 
 if test "$_WIN32_MSVC"; then
     MOZ_MAPI_SUPPORT=1
 fi
@@ -86,17 +75,16 @@ AC_SUBST(MOZ_MAPI_SUPPORT)
 
 if test -n "$MOZ_MAPI_SUPPORT"; then
     AC_DEFINE(MOZ_MAPI_SUPPORT)
     MAIL_MODULE="$MAIL_MODULE MODULE(msgMapiModule)"
 fi
 
 if test -z "$MOZ_INCOMPLETE_EXTERNAL_LINKAGE"; then
   MOZ_APP_COMPONENT_MODULES="MODULE(nsMailCompsModule) $MAIL_MODULE $LDAP_MODULE $MORK_MODULE"
-  MOZ_APP_EXTRA_LIBS="$LDAP_LIBS"
 fi
 
 # if we're building the LDAP XPCOM component, we need to build
 # the c-sdk first.
 if test -n "$COMPILE_ENVIRONMENT" -a -n "$MOZ_LDAP_XPCOM"; then
     # Save configure args so we can restore them after configuring LDAP.
     _save_ac_configure_args="$ac_configure_args"
     ac_configure_args="$_SUBDIR_CONFIG_ARGS"
--- a/mailnews/base/test/moz.build
+++ b/mailnews/base/test/moz.build
@@ -13,11 +13,12 @@ SOURCES += sorted('%s.cpp' % t for t in 
 
 LOCAL_INCLUDES += [
     '/mozilla/netwerk/test',
     '/mozilla/xpcom/tests',
 ]
 
 USE_LIBS += [
     'mozalloc',
+    'nspr',
     'xpcomglue_s',
     'xul',
 ]
deleted file mode 100644
--- a/mailnews/build/Makefile.in
+++ /dev/null
@@ -1,15 +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/.
-
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-EXTRA_LIBS += $(NSPR_LIBS)
-
-include $(topsrcdir)/config/rules.mk
--- a/mailnews/build/moz.build
+++ b/mailnews/build/moz.build
@@ -4,16 +4,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 SOURCES += [
     'nsMailModule.cpp',
 ]
 
 USE_LIBS += [
     'mozalloc',
+    'nspr',
 ]
 
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     IS_COMPONENT = True
     USE_LIBS += [
         'rdfutil_external_s',
         'unicharutil_external_s',
         'xpcomglue_s',
deleted file mode 100644
--- a/mailnews/imap/test/Makefile.in
+++ /dev/null
@@ -1,16 +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/.
-
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-include $(topsrcdir)/config/rules.mk
-
-EXTRA_LIBS += $(NSPR_LIBS)
--- a/mailnews/imap/test/moz.build
+++ b/mailnews/imap/test/moz.build
@@ -10,13 +10,14 @@ LOCAL_INCLUDES += [
    '/mailnews/base/util',
    '/mozilla/xpcom/tests',
 ]
 
 USE_LIBS += [
     'mozalloc',
     'msgbsutl_s',
     'msgimap_s',
+    'nspr',
     'xpcomglue_s',
     'xul',
 ]
 
 OS_LIBS += CONFIG['MOZ_ZLIB_LIBS']
--- a/mailnews/import/build/Makefile.in
+++ b/mailnews/import/build/Makefile.in
@@ -9,11 +9,9 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 ifdef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 SHARED_LIBRARY_LIBS = ../../base/util/$(LIB_PREFIX)msgbsutl_s.$(LIB_SUFFIX)
 endif
 
-EXTRA_LIBS += $(NSPR_LIBS)
-
 include $(topsrcdir)/config/rules.mk
--- a/mailnews/import/build/moz.build
+++ b/mailnews/import/build/moz.build
@@ -4,16 +4,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 SOURCES += [
     'nsImportModule.cpp',
 ]
 
 USE_LIBS += [
     'mozalloc',
+    'nspr',
 ]
 
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     IS_COMPONENT = True
     USE_LIBS += [
         'rdfutil_external_s',
         'unicharutil_external_s',
         'xpcomglue_s',
--- a/suite/configure.in
+++ b/suite/configure.in
@@ -48,32 +48,21 @@ dnl = LDAP
 dnl =========================================================
 MOZ_ARG_DISABLE_BOOL(ldap,
 [  --disable-ldap          Disable LDAP support],
     MOZ_LDAP_XPCOM=,
     MOZ_LDAP_XPCOM=1)
 
 if test "$MOZ_LDAP_XPCOM"; then
     LDAP_CFLAGS='-I${DIST}/public/ldap'
-    if test "$OS_ARCH" = "WINNT"; then
-        if test -n "$GNU_CC"; then
-            LDAP_LIBS='-L$(DIST)/lib -lnsldap32v60 -lnsldappr32v60 -lnsldif32v60'
-        else
-            LDAP_LIBS='$(DIST)/lib/$(LIB_PREFIX)nsldap32v60.${IMPORT_LIB_SUFFIX} $(DIST)/lib/$(LIB_PREFIX)nsldappr32v60.${IMPORT_LIB_SUFFIX} $(DIST)/lib/$(LIB_PREFIX)nsldif32v60.${IMPORT_LIB_SUFFIX}'
-        fi
-    else
-        LDAP_LIBS='-L${DIST}/bin -L${DIST}/lib -lldap60 -lprldap60 -lldif60'
-    fi
-
     LDAP_MODULE="MODULE(nsLDAPProtocolModule)"
 fi
 
 AC_SUBST(MOZ_LDAP_XPCOM)
 AC_SUBST(LDAP_CFLAGS)
-AC_SUBST(LDAP_LIBS)
 
 dnl =========================================================
 dnl = MAPI support (Windows only)
 dnl =========================================================
 
 if test "$_WIN32_MSVC"; then
     MOZ_MAPI_SUPPORT=1
 fi
@@ -86,17 +75,16 @@ AC_SUBST(MOZ_MAPI_SUPPORT)
 
 if test -n "$MOZ_MAPI_SUPPORT"; then
     AC_DEFINE(MOZ_MAPI_SUPPORT)
     MAIL_MODULE="$MAIL_MODULE MODULE(msgMapiModule)"
 fi
 
 if test -z "$MOZ_INCOMPLETE_EXTERNAL_LINKAGE"; then
   MOZ_APP_COMPONENT_MODULES="$MAIL_MODULE $LDAP_MODULE $MORK_MODULE"
-  MOZ_APP_EXTRA_LIBS="$LDAP_LIBS"
 fi
 
 # if we're building the LDAP XPCOM component, we need to build
 # the c-sdk first.
 if test -n "$COMPILE_ENVIRONMENT" -a -n "$MOZ_LDAP_XPCOM"; then
     # Save configure args so we can restore them after configuring LDAP.
     _save_ac_configure_args="$ac_configure_args"
     ac_configure_args="$_SUBDIR_CONFIG_ARGS"
--- a/suite/profile/Makefile.in
+++ b/suite/profile/Makefile.in
@@ -4,14 +4,12 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXTRA_LIBS += $(NSPR_LIBS)
-
 USE_STATIC_LIBS = 1
 
 include $(topsrcdir)/config/rules.mk
 
--- a/suite/profile/moz.build
+++ b/suite/profile/moz.build
@@ -13,10 +13,11 @@ SOURCES += [
 ]
 
 FINAL_LIBRARY = 'suite'
 
 JAR_MANIFESTS += ['jar.mn']
 
 USE_LIBS += [
     'mozalloc',
+    'nspr',
     'xul',
 ]