nss/nss-3.13.3-build.patch

   1 ---  misc/build/nss-3.13.5/mozilla/security/coreconf/rules.mk   2010-04-26 01:37:40.000000000 +0200
   2 +++  misc/build/nss-3.13.5/mozilla/security/coreconf/rules.mk   2011-11-11 21:39:26.576273015 +0100
   3 @@ -400,7 +400,7 @@
   4  PWD := $(shell pwd)
   5  ifeq (,$(findstring ;,$(PATH)))
   6  ifndef USE_MSYS
   7 -PWD := $(subst \,/,$(shell cygpath -w $(PWD)))
   8 +#PWD := $(subst \,/,$(shell cygpath -w $(PWD)))
   9  endif
  10  endif
  11
  12 ---  misc/build/nss-3.13.5/mozilla/security/coreconf/WIN32.mk   2011-09-14 19:59:43.000000000 +0200
  13 +++  misc/build/nss-3.13.5/mozilla/security/coreconf/WIN32.mk   2011-11-11 21:41:44.941584692 +0100
  14 @@ -124,7 +124,7 @@
  15      # The -mnop-fun-dllimport flag allows us to avoid a drawback of
  16      # the dllimport attribute that a pointer to a function marked as
  17      # dllimport cannot be used as as a constant address.
  18 -    OS_CFLAGS += -mwindows -mms-bitfields -mnop-fun-dllimport
  19 +    OS_CFLAGS += -mwindows -mms-bitfields -mnop-fun-dllimport -D_WIN32_IE=0x0501 -U__MMX__ -U__SSE__ -U__SSE2__
  20      _GEN_IMPORT_LIB=-Wl,--out-implib,$(IMPORT_LIBRARY)
  21      DLLFLAGS  += -mwindows -o $@ -shared -Wl,--export-all-symbols $(if $(IMPORT_LIBRARY),$(_GEN_IMPORT_LIB))
  22      ifdef BUILD_OPT
  23 ---  misc/build/nss-3.13.5/mozilla/security/coreconf/WINNT.mk   2009-02-14 06:51:10.000000000 +0100
  24 +++  misc/build/nss-3.13.5/mozilla/security/coreconf/WINNT.mk   2011-11-11 21:39:26.580272977 +0100
  25 @@ -46,7 +46,7 @@
  26  #
  27  # Win NT needs -GT so that fibers can work
  28  #
  29 -OS_CFLAGS += -GT
  30 +#OS_CFLAGS += -GT
  31
  32  # WINNT uses the lib prefix, Win95 and WinCE don't
  33  NSPR31_LIB_PREFIX = lib
  34 ---  misc/build/nss-3.13.5/mozilla/security/nss/cmd/crmftest/Makefile   2005-11-14 01:17:21.000000000 +0100
  35 +++  misc/build/nss-3.13.5/mozilla/security/nss/cmd/crmftest/Makefile   2011-11-11 21:39:26.596273012 +0100
  36 @@ -90,7 +90,7 @@
  37  LDDIST = $(DIST)/lib
  38
  39  ifeq (,$(filter-out WIN%,$(OS_TARGET)))
  40 -EXTRA_LIBS += $(LDDIST)/sectool.lib
  41 +#EXTRA_LIBS += $(LDDIST)/sectool.lib
  42  endif
  43
  44  include ../platrules.mk
  45 ---  misc/build/nss-3.13.5/mozilla/security/nss/cmd/pk11mode/Makefile   2009-03-31 01:40:52.000000000 +0200
  46 +++  misc/build/nss-3.13.5/mozilla/security/nss/cmd/pk11mode/Makefile   2011-11-11 21:39:26.596273012 +0100
  47 @@ -61,9 +61,9 @@
  48  ifeq ($(OS_ARCH), WINNT)
  49
  50  EXTRA_LIBS += \
  51 -       $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4.$(LIB_SUFFIX) \
  52 -       $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4.$(LIB_SUFFIX) \
  53 -       $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)nspr4.$(LIB_SUFFIX) \
  54 +       $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4.$(IMPORT_LIB_SUFFIX) \
  55 +       $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4.$(IMPORT_LIB_SUFFIX) \
  56 +       $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)nspr4.$(IMPORT_LIB_SUFFIX) \
  57         $(NULL)
  58
  59  else
  60 ---  misc/build/nss-3.13.5/mozilla/security/nss/cmd/shlibsign/Makefile  2009-08-07 21:06:37.000000000 +0200
  61 +++  misc/build/nss-3.13.5/mozilla/security/nss/cmd/shlibsign/Makefile  2011-11-11 21:39:26.596273012 +0100
  62 @@ -59,9 +59,9 @@
  63  ifeq ($(OS_ARCH), WINNT)
  64
  65  EXTRA_LIBS += \
  66 -       $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4.$(LIB_SUFFIX) \
  67 -       $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4.$(LIB_SUFFIX) \
  68 -       $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)nspr4.$(LIB_SUFFIX) \
  69 +       $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4.$(IMPORT_LIB_SUFFIX) \
  70 +       $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4.$(IMPORT_LIB_SUFFIX) \
  71 +       $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)nspr4.$(IMPORT_LIB_SUFFIX) \
  72         $(NULL)
  73
  74  else
  75 @@ -85,8 +85,8 @@
  76  endif
  77  CHECKLOC = $(CHECKLIBS:.$(DLL_SUFFIX)=.chk)
  78
  79 -MD_LIB_RELEASE_FILES = $(CHECKLOC)
  80 -ALL_TRASH += $(CHECKLOC)
  81 +MD_LIB_RELEASE_FILES = # $(CHECKLOC)
  82 +#ALL_TRASH += $(CHECKLOC)
  83
  84
  85  #######################################################################
  86 @@ -120,5 +120,5 @@
  87         $(call core_abspath,$(NSPR_LIB_DIR)) $(call core_abspath,$<)
  88  endif
  89
  90 -libs install :: $(CHECKLOC)
  91 +libs install :: #$(CHECKLOC)
  92
  93 ---  misc/build/nss-3.13.5/mozilla/security/nss/cmd/shlibsign/mangle/Makefile   2008-11-20 16:44:24.000000000 +0100
  94 +++  misc/build/nss-3.13.5/mozilla/security/nss/cmd/shlibsign/mangle/Makefile   2011-11-11 21:39:26.600273013 +0100
  95 @@ -59,9 +59,9 @@
  96  ifeq ($(OS_ARCH), WINNT)
  97
  98  EXTRA_LIBS += \
  99 -       $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4.$(LIB_SUFFIX) \
 100 -       $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4.$(LIB_SUFFIX) \
 101 -       $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)nspr4.$(LIB_SUFFIX) \
 102 +       $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4.$(IMPORT_LIB_SUFFIX) \
 103 +       $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4.$(IMPORT_LIB_SUFFIX) \
 104 +       $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)nspr4.$(IMPORT_LIB_SUFFIX) \
 105         $(NULL)
 106
 107  else
 108 ---  misc/build/nss-3.13.5/mozilla/security/nss/lib/ckfw/builtins/config.mk     2009-06-11 02:55:34.000000000 +0200
 109 +++  misc/build/nss-3.13.5/mozilla/security/nss/lib/ckfw/builtins/config.mk     2011-11-11 21:39:26.600273013 +0100
 110 @@ -48,7 +48,7 @@
 111
 112  ifeq (,$(filter-out WIN%,$(OS_TARGET)))
 113      SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
 114 -    RES = $(OBJDIR)/$(LIBRARY_NAME).res
 115 +    RES = $(OBJDIR)/$(LIBRARY_NAME).res.o
 116      RESNAME = $(LIBRARY_NAME).rc
 117  endif
 118
 119 ---  misc/build/nss-3.13.5/mozilla/security/nss/lib/ckfw/capi/Makefile  2009-07-29 22:15:19.000000000 +0200
 120 +++  misc/build/nss-3.13.5/mozilla/security/nss/lib/ckfw/capi/Makefile  2011-11-11 21:39:26.608273006 +0100
 121 @@ -75,6 +75,9 @@
 122         -lplc4 \
 123         -lplds4 \
 124         -lnspr4 \
 125 +        -lcrypt32 \
 126 +        -ladvapi32 \
 127 +        -lrpcrt4 \
 128         $(NULL)
 129  endif
 130
 131 ---  misc/build/nss-3.13.5/mozilla/security/nss/lib/freebl/config.mk    2010-08-18 00:27:12.000000000 +0200
 132 +++  misc/build/nss-3.13.5/mozilla/security/nss/lib/freebl/config.mk    2011-11-11 21:39:26.608273006 +0100
 133 @@ -82,7 +82,7 @@
 134  # don't want the 32 in the shared library name
 135  SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
 136
 137 -RES     = $(OBJDIR)/$(LIBRARY_NAME).res
 138 +RES     = $(OBJDIR)/$(LIBRARY_NAME).res.o
 139  RESNAME = freebl.rc
 140
 141  ifndef WINCE
 142 ---  misc/build/nss-3.13.5/mozilla/security/nss/lib/freebl/Makefile     2011-02-06 11:13:27.000000000 +0100
 143 +++  misc/build/nss-3.13.5/mozilla/security/nss/lib/freebl/Makefile     2011-11-11 21:39:26.608273006 +0100
 144 @@ -167,6 +167,17 @@
 145      endif
 146  endif
 147  else
 148 +# 64-bit Windows
 149 +ifdef NS_USE_GCC
 150 +    # win64/gcc - use the x86 code for now, skipping optimization
 151 +    ifdef BUILD_OPT
 152 +       OPTIMIZER += -Os
 153 +    endif
 154 +    ASFILES  =
 155 +    DEFINES += -DMPI_AMD64 -DMP_USE_UINT_DIGIT
 156 +    DEFINES += -DMP_CHAR_STORE_SLOW -DMP_IS_LITTLE_ENDIAN
 157 +else
 158 +# MSVC
 159      # -DMP_NO_MP_WORD
 160      ifdef BUILD_OPT
 161         OPTIMIZER += -Ox  # maximum optimization for freebl
 162 @@ -178,6 +189,7 @@
 163      MPI_SRCS += mpi_amd64.c
 164  endif
 165  endif
 166 +endif
 167
 168  ifeq ($(OS_TARGET),WINCE)
 169      DEFINES += -DMP_ARGCHK=0   # no assert in WinCE
 170 ---  misc/build/nss-3.13.5/mozilla/security/nss/lib/freebl/mpi/mpi-priv.h       2010-07-20 03:26:02.000000000 +0200
 171 +++  misc/build/nss-3.13.5/mozilla/security/nss/lib/freebl/mpi/mpi-priv.h       2011-11-11 21:39:26.632273000 +0100
 172 @@ -254,7 +254,7 @@
 173  #define MPI_ASM_DECL
 174  #endif
 175
 176 -#ifdef MPI_AMD64
 177 +#if defined(MPI_AMD64) && defined(MP_ASSEMBLY_MULTIPLY)
 178
 179  mp_digit MPI_ASM_DECL s_mpv_mul_set_vec64(mp_digit*, mp_digit *, mp_size, mp_digit);
 180  mp_digit MPI_ASM_DECL s_mpv_mul_add_vec64(mp_digit*, const mp_digit*, mp_size, mp_digit);
 181 ---  misc/build/nss-3.13.5/mozilla/security/nss/lib/nss/config.mk       2009-12-15 23:22:31.000000000 +0100
 182 +++  misc/build/nss-3.13.5/mozilla/security/nss/lib/nss/config.mk       2011-11-11 21:39:26.632273000 +0100
 183 @@ -42,7 +42,7 @@
 184  SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
 185  IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(IMPORT_LIB_SUFFIX)
 186
 187 -RES = $(OBJDIR)/$(LIBRARY_NAME).res
 188 +RES = $(OBJDIR)/$(LIBRARY_NAME).res.o
 189  RESNAME = $(LIBRARY_NAME).rc
 190
 191  ifdef NS_USE_GCC
 192 ---  misc/build/nss-3.13.5/mozilla/security/nss/lib/smime/config.mk     2009-06-11 02:55:47.000000000 +0200
 193 +++  misc/build/nss-3.13.5/mozilla/security/nss/lib/smime/config.mk     2011-11-11 21:39:26.632273000 +0100
 194 @@ -43,7 +43,7 @@
 195  SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
 196  IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(IMPORT_LIB_SUFFIX)
 197
 198 -RES = $(OBJDIR)/smime.res
 199 +RES = $(OBJDIR)/smime.res.o
 200  RESNAME = smime.rc
 201
 202  ifdef NS_USE_GCC
 203 ---  misc/build/nss-3.13.5/mozilla/security/nss/lib/softoken/config.mk  2010-06-12 02:58:33.000000000 +0200
 204 +++  misc/build/nss-3.13.5/mozilla/security/nss/lib/softoken/config.mk  2011-11-11 21:39:26.632273000 +0100
 205 @@ -49,7 +49,7 @@
 206  SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
 207  IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(IMPORT_LIB_SUFFIX)
 208
 209 -RES = $(OBJDIR)/$(LIBRARY_NAME).res
 210 +RES = $(OBJDIR)/$(LIBRARY_NAME).res.o
 211  RESNAME = $(LIBRARY_NAME).rc
 212
 213  ifdef NS_USE_GCC
 214 ---  misc/build/nss-3.13.5/mozilla/security/nss/lib/softoken/legacydb/config.mk 2009-06-11 02:55:49.000000000 +0200
 215 +++  misc/build/nss-3.13.5/mozilla/security/nss/lib/softoken/legacydb/config.mk 2011-11-11 21:39:26.632273000 +0100
 216 @@ -51,7 +51,7 @@
 217  SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
 218  IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(IMPORT_LIB_SUFFIX)
 219
 220 -RES = $(OBJDIR)/$(LIBRARY_NAME).res
 221 +RES = $(OBJDIR)/$(LIBRARY_NAME).res.o
 222  RESNAME = $(LIBRARY_NAME).rc
 223
 224  ifdef NS_USE_GCC
 225 ---  misc/build/nss-3.13.5/mozilla/security/nss/lib/ssl/config.mk       2010-02-04 20:09:08.000000000 +0100
 226 +++  misc/build/nss-3.13.5/mozilla/security/nss/lib/ssl/config.mk       2011-11-11 21:39:26.632273000 +0100
 227 @@ -55,7 +55,7 @@
 228  SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
 229  IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(IMPORT_LIB_SUFFIX)
 230
 231 -RES = $(OBJDIR)/ssl.res
 232 +RES = $(OBJDIR)/ssl.res.o
 233  RESNAME = ssl.rc
 234
 235  ifdef NS_USE_GCC
 236 ---  misc/build/nss-3.13.5/mozilla/security/nss/lib/sysinit/config.mk   2010-02-16 20:38:42.000000000 +0100
 237 +++  misc/build/nss-3.13.5/mozilla/security/nss/lib/sysinit/config.mk   2011-11-11 21:39:26.636273000 +0100
 238 @@ -47,8 +47,8 @@
 239  SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
 240  IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(IMPORT_LIB_SUFFIX)
 241
 242 -RES = $(OBJDIR)/$(LIBRARY_NAME).res
 243 -RESNAME = $(LIBRARY_NAME).rc
 244 +#RES = $(OBJDIR)/$(LIBRARY_NAME).res
 245 +#RESNAME = $(LIBRARY_NAME).rc
 246
 247  ifdef NS_USE_GCC
 248  EXTRA_SHARED_LIBS += \
 249 ---  misc/build/nss-3.13.5/mozilla/security/nss/lib/util/config.mk      2009-12-15 23:22:31.000000000 +0100
 250 +++  misc/build/nss-3.13.5/mozilla/security/nss/lib/util/config.mk      2011-11-11 21:39:26.636273000 +0100
 251 @@ -42,7 +42,7 @@
 252  SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
 253  IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(IMPORT_LIB_SUFFIX)
 254
 255 -RES = $(OBJDIR)/$(LIBRARY_NAME).res
 256 +RES = $(OBJDIR)/$(LIBRARY_NAME).res.o
 257  RESNAME = $(LIBRARY_NAME).rc
 258
 259  ifdef NS_USE_GCC