nss/nss.mingw.patch.3

   1 diff -up misc/build/nss-3.13.5/mozilla/nsprpub/config/Makefile.in.dt nss/wntgcci.pro/misc/build/nss-3.13.5/mozilla/nsprpub/config/Makefile.in
   2 --- misc/build/nss-3.13.5/mozilla/nsprpub/config/Makefile.in.dt 2012-10-29 13:30:49.244696426 +0100
   3 +++ misc/build/nss-3.13.5/mozilla/nsprpub/config/Makefile.in    2012-10-29 13:31:26.541830215 +0100
   4 @@ -30,7 +30,6 @@ CSRCS = now.c
   5
   6  # This version hasn't been ported for us; the one in mozilla/config has
   7  ifneq ($(OS_ARCH),OS2)
   8 -CSRCS  += nsinstall.c
   9
  10  PLSRCS = nfspwd.pl
  11  endif
  12 @@ -84,7 +83,6 @@ else
  13  ifeq (,$(filter-out SYMBIAN WINCE,$(OS_ARCH)))
  14  TARGETS = $(PROGS)
  15  else
  16 -PROGS  += $(OBJDIR)/nsinstall$(PROG_SUFFIX)
  17  TARGETS = $(PROGS) $(PLSRCS:.pl=)
  18  endif
  19  endif
  20 diff -up ./nss-3.13.5/mozilla/security/nss/Makefile.dt ./nss-3.13.5/mozilla/security/nss/Makefile
  21 --- misc/build/nss-3.13.5/mozilla/security/nss/Makefile.dt      2012-10-30 10:13:07.165713712 +0100
  22 +++ misc/build/nss-3.13.5/mozilla/security/nss/Makefile 2012-10-30 10:13:09.680656998 +0100
  23 @@ -58,7 +58,7 @@ include $(CORE_DEPTH)/coreconf/config.mk
  24  # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
  25  #######################################################################
  26
  27 -ifeq ($(OS_TARGET),WINCE)
  28 +ifeq ($(OS_TARGET),WINNT)
  29  DIRS   = lib   # omit cmd since wince has no command line shell
  30  endif
  31
  32 diff -up misc/build/nss-3.13.5/mozilla/security/nss/cmd/platlibs.mk.dt misc/build/nss-3.13.5/mozilla/security/nss/cmd/platlibs.mk
  33 diff -up misc/build/nss-3.13.5/mozilla/security/nss/lib/nss/config.mk.dt misc/build/nss-3.13.5/mozilla/security/nss/lib/nss/config.mk
  34 --- misc/build/nss-3.13.5/mozilla/security/nss/lib/nss/config.mk.dt     2012-10-30 12:31:06.675726730 +0100
  35 +++ misc/build/nss-3.13.5/mozilla/security/nss/lib/nss/config.mk        2012-10-30 12:31:08.860676053 +0100
  36 @@ -40,7 +40,7 @@ ifeq (,$(filter-out WIN%,$(OS_TARGET)))
  37
  38  # don't want the 32 in the shared library name
  39  SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
  40 -IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)
  41 +IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(IMPORT_LIB_SUFFIX)
  42
  43  RES = $(OBJDIR)/$(LIBRARY_NAME).res.o
  44  RESNAME = $(LIBRARY_NAME).rc
  45 diff -up misc/build/nss-3.13.5/mozilla/security/nss/lib/smime/config.mk.dt misc/build/nss-3.13.5/mozilla/security/nss/lib/smime/config.mk
  46 --- misc/build/nss-3.13.5/mozilla/security/nss/lib/smime/config.mk.dt   2012-10-30 12:30:52.020062600 +0100
  47 +++ misc/build/nss-3.13.5/mozilla/security/nss/lib/smime/config.mk      2012-10-30 12:30:54.504004586 +0100
  48 @@ -41,7 +41,7 @@ ifeq (,$(filter-out WIN%,$(OS_TARGET)))
  49
  50  # don't want the 32 in the shared library name
  51  SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
  52 -IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)
  53 +IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(IMPORT_LIB_SUFFIX)
  54
  55  RES = $(OBJDIR)/smime.res.o
  56  RESNAME = smime.rc
  57 diff -up misc/build/nss-3.13.5/mozilla/security/nss/lib/softoken/config.mk.dt misc/build/nss-3.13.5/mozilla/security/nss/lib/softoken/config.mk
  58 --- misc/build/nss-3.13.5/mozilla/security/nss/lib/softoken/config.mk.dt        2012-10-30 12:31:02.707816790 +0100
  59 +++ misc/build/nss-3.13.5/mozilla/security/nss/lib/softoken/config.mk   2012-10-30 12:31:04.388778631 +0100
  60 @@ -47,7 +47,7 @@ ifeq (,$(filter-out WIN%,$(OS_TARGET)))
  61
  62  # don't want the 32 in the shared library name
  63  SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
  64 -IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)
  65 +IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(IMPORT_LIB_SUFFIX)
  66
  67  RES = $(OBJDIR)/$(LIBRARY_NAME).res.o
  68  RESNAME = $(LIBRARY_NAME).rc
  69 diff -up misc/build/nss-3.13.5/mozilla/security/nss/lib/softoken/legacydb/config.mk.dt misc/build/nss-3.13.5/mozilla/security/nss/lib/softoken/legacydb/config.mk
  70 --- misc/build/nss-3.13.5/mozilla/security/nss/lib/softoken/legacydb/config.mk.dt       2012-10-30 12:30:56.531958414 +0100
  71 +++ misc/build/nss-3.13.5/mozilla/security/nss/lib/softoken/legacydb/config.mk  2012-10-30 12:31:00.575865594 +0100
  72 @@ -48,7 +48,7 @@ ifeq (,$(filter-out WIN%,$(OS_TARGET)))
  73
  74  # don't want the 32 in the shared library name
  75  SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
  76 -IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)
  77 +IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(IMPORT_LIB_SUFFIX)
  78
  79  RES = $(OBJDIR)/$(LIBRARY_NAME).res.o
  80  RESNAME = $(LIBRARY_NAME).rc
  81 diff -up misc/build/nss-3.13.5/mozilla/security/nss/lib/sqlite/config.mk.dt misc/build/nss-3.13.5/mozilla/security/nss/lib/sqlite/config.mk
  82 --- misc/build/nss-3.13.5/mozilla/security/nss/lib/sqlite/config.mk.dt  2012-10-30 12:31:10.499638736 +0100
  83 +++ misc/build/nss-3.13.5/mozilla/security/nss/lib/sqlite/config.mk     2012-10-30 12:31:12.624590177 +0100
  84 @@ -41,7 +41,7 @@ ifeq (,$(filter-out WIN%,$(OS_TARGET)))
  85
  86  # don't want the 32 in the shared library name
  87  SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
  88 -IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)
  89 +IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(IMPORT_LIB_SUFFIX)
  90
  91  #RES = $(OBJDIR)/$(LIBRARY_NAME).res
  92  #RESNAME = $(LIBRARY_NAME).rc
  93 diff -up misc/build/nss-3.13.5/mozilla/security/nss/lib/ssl/config.mk.dt misc/build/nss-3.13.5/mozilla/security/nss/lib/ssl/config.mk
  94 --- misc/build/nss-3.13.5/mozilla/security/nss/lib/ssl/config.mk.dt     2012-10-30 12:31:14.882539495 +0100
  95 +++ misc/build/nss-3.13.5/mozilla/security/nss/lib/ssl/config.mk        2012-10-30 12:31:16.379504032 +0100
  96 @@ -53,7 +53,7 @@ ifeq (,$(filter-out WIN%,$(OS_TARGET)))
  97
  98  # don't want the 32 in the shared library name
  99  SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
 100 -IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)
 101 +IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(IMPORT_LIB_SUFFIX)
 102
 103  RES = $(OBJDIR)/ssl.res.o
 104  RESNAME = ssl.rc
 105 diff -up misc/build/nss-3.13.5/mozilla/security/nss/lib/sysinit/config.mk.dt misc/build/nss-3.13.5/mozilla/security/nss/lib/sysinit/config.mk
 106 --- misc/build/nss-3.13.5/mozilla/security/nss/lib/sysinit/config.mk.dt 2012-10-30 12:31:18.195462428 +0100
 107 +++ misc/build/nss-3.13.5/mozilla/security/nss/lib/sysinit/config.mk    2012-10-30 12:31:20.277414942 +0100
 108 @@ -45,7 +45,7 @@ ifeq (,$(filter-out WIN%,$(OS_TARGET)))
 109
 110  # don't want the 32 in the shared library name
 111  SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
 112 -IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)
 113 +IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(IMPORT_LIB_SUFFIX)
 114
 115  #RES = $(OBJDIR)/$(LIBRARY_NAME).res
 116  #RESNAME = $(LIBRARY_NAME).rc
 117 diff -up misc/build/nss-3.13.5/mozilla/security/nss/lib/util/config.mk.dt misc/build/nss-3.13.5/mozilla/security/nss/lib/util/config.mk
 118 --- misc/build/nss-3.13.5/mozilla/security/nss/lib/util/config.mk.dt    2012-10-30 12:31:22.179371231 +0100
 119 +++ misc/build/nss-3.13.5/mozilla/security/nss/lib/util/config.mk       2012-10-30 12:31:24.074328169 +0100
 120 @@ -40,7 +40,7 @@ ifeq (,$(filter-out WIN%,$(OS_TARGET)))
 121
 122  # don't want the 32 in the shared library name
 123  SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
 124 -IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)
 125 +IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(IMPORT_LIB_SUFFIX)
 126
 127  RES = $(OBJDIR)/$(LIBRARY_NAME).res.o
 128  RESNAME = $(LIBRARY_NAME).rc