external/nss/nss.mingw.patch.3

   1 --- a/a/a/nspr/config/Makefile.in.dt    2012-10-29 13:30:49.244696426 +0100
   2 +++ a/a/a/nspr/config/Makefile.in       2012-10-29 13:31:26.541830215 +0100
   3 @@ -30,7 +30,6 @@ CSRCS = now.c
   4
   5  # This version hasn't been ported for us; the one in mozilla/config has
   6  ifneq ($(OS_ARCH),OS2)
   7 -CSRCS  += nsinstall.c
   8
   9  PLSRCS = nfspwd.pl
  10  endif
  11 @@ -84,7 +83,6 @@ else
  12  ifeq (,$(filter-out SYMBIAN WINCE,$(OS_ARCH)))
  13  TARGETS = $(PROGS)
  14  else
  15 -PROGS  += $(OBJDIR)/nsinstall$(PROG_SUFFIX)
  16  TARGETS = $(PROGS) $(PLSRCS:.pl=)
  17  endif
  18  endif
  19 --- a/a/a/nss/lib/nss/config.mk.dt      2012-10-30 12:31:06.675726730 +0100
  20 +++ a/a/a/nss/lib/nss/config.mk 2012-10-30 12:31:08.860676053 +0100
  21 @@ -40,7 +40,7 @@ ifeq (,$(filter-out WIN%,$(OS_TARGET)))
  22
  23  # don't want the 32 in the shared library name
  24  SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
  25 -IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)
  26 +IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(IMPORT_LIB_SUFFIX)
  27
  28  RES = $(OBJDIR)/$(LIBRARY_NAME).res.o
  29  RESNAME = $(LIBRARY_NAME).rc
  30 --- a/a/a/nss/lib/smime/config.mk.dt    2012-10-30 12:30:52.020062600 +0100
  31 +++ a/a/a/nss/lib/smime/config.mk       2012-10-30 12:30:54.504004586 +0100
  32 @@ -41,7 +41,7 @@ ifeq (,$(filter-out WIN%,$(OS_TARGET)))
  33
  34  # don't want the 32 in the shared library name
  35  SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
  36 -IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)
  37 +IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(IMPORT_LIB_SUFFIX)
  38
  39  RES = $(OBJDIR)/smime.res.o
  40  RESNAME = smime.rc
  41 --- a/a/a/nss/lib/softoken/config.mk.dt 2012-10-30 12:31:02.707816790 +0100
  42 +++ a/a/a/nss/lib/softoken/config.mk    2012-10-30 12:31:04.388778631 +0100
  43 @@ -47,7 +47,7 @@ ifeq (,$(filter-out WIN%,$(OS_TARGET)))
  44
  45  # don't want the 32 in the shared library name
  46  SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
  47 -IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)
  48 +IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(IMPORT_LIB_SUFFIX)
  49
  50  RES = $(OBJDIR)/$(LIBRARY_NAME).res.o
  51  RESNAME = $(LIBRARY_NAME).rc
  52 --- a/a/a/nss/lib/softoken/legacydb/config.mk.dt        2012-10-30 12:30:56.531958414 +0100
  53 +++ a/a/a/nss/lib/softoken/legacydb/config.mk   2012-10-30 12:31:00.575865594 +0100
  54 @@ -48,7 +48,7 @@ ifeq (,$(filter-out WIN%,$(OS_TARGET)))
  55
  56  # don't want the 32 in the shared library name
  57  SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
  58 -IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)
  59 +IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(IMPORT_LIB_SUFFIX)
  60
  61  RES = $(OBJDIR)/$(LIBRARY_NAME).res.o
  62  RESNAME = $(LIBRARY_NAME).rc
  63 --- a/a/a/nss/lib/sqlite/config.mk.dt   2012-10-30 12:31:10.499638736 +0100
  64 +++ a/a/a/nss/lib/sqlite/config.mk      2012-10-30 12:31:12.624590177 +0100
  65 @@ -41,7 +41,7 @@ ifeq (,$(filter-out WIN%,$(OS_TARGET)))
  66
  67  # don't want the 32 in the shared library name
  68  SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
  69 -IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)
  70 +IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(IMPORT_LIB_SUFFIX)
  71
  72  #RES = $(OBJDIR)/$(LIBRARY_NAME).res
  73  #RESNAME = $(LIBRARY_NAME).rc
  74 --- a/a/a/nss/lib/ssl/config.mk.dt      2012-10-30 12:31:14.882539495 +0100
  75 +++ a/a/a/nss/lib/ssl/config.mk 2012-10-30 12:31:16.379504032 +0100
  76 @@ -53,7 +53,7 @@ ifeq (,$(filter-out WIN%,$(OS_TARGET)))
  77
  78  # don't want the 32 in the shared library name
  79  SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
  80 -IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)
  81 +IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(IMPORT_LIB_SUFFIX)
  82
  83  RES = $(OBJDIR)/ssl.res.o
  84  RESNAME = ssl.rc
  85 --- a/a/a/nss/lib/sysinit/config.mk.dt  2012-10-30 12:31:18.195462428 +0100
  86 +++ a/a/a/nss/lib/sysinit/config.mk     2012-10-30 12:31:20.277414942 +0100
  87 @@ -45,7 +45,7 @@ ifeq (,$(filter-out WIN%,$(OS_TARGET)))
  88
  89  # don't want the 32 in the shared library name
  90  SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
  91 -IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)
  92 +IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(IMPORT_LIB_SUFFIX)
  93
  94  #RES = $(OBJDIR)/$(LIBRARY_NAME).res
  95  #RESNAME = $(LIBRARY_NAME).rc
  96 --- a/a/a/nss/lib/util/config.mk.dt     2012-10-30 12:31:22.179371231 +0100
  97 +++ a/a/a/nss/lib/util/config.mk        2012-10-30 12:31:24.074328169 +0100
  98 @@ -40,7 +40,7 @@ ifeq (,$(filter-out WIN%,$(OS_TARGET)))
  99
 100  # don't want the 32 in the shared library name
 101  SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
 102 -IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)
 103 +IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(IMPORT_LIB_SUFFIX)
 104
 105  RES = $(OBJDIR)/$(LIBRARY_NAME).res.o
 106  RESNAME = $(LIBRARY_NAME).rc