Befator-Inc-Firmen-Netzwerk/MINGW-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity
Files
a79d95c1c8dab144f6cb179bae9e72028da170a0
MINGW-packages/mingw-w64-nss/nss-3.14.3-build.patch
Alexpux a7d9952810 nss: Update to 3.19.2
2015-06-24 09:50:24 +03:00

287 lines
10 KiB
Diff
Raw Blame History

--- nss-3.14.3/nss/coreconf/rules.mk 2012-12-08 06:43:26.000000000 +0100
+++ nss-3.14.3/nss/coreconf/rules.mk 2013-04-09 11:04:28.263194310 +0200
@@ -366,7 +366,7 @@
PWD := $(shell pwd)
ifeq (,$(findstring ;,$(PATH)))
ifndef USE_MSYS
-PWD := $(subst \,/,$(shell cygpath -w $(PWD)))
+#PWD := $(subst \,/,$(shell cygpath -w $(PWD)))
endif
endif
endif
--- nss-3.14.3/nss/coreconf/WIN32.mk 2012-05-03 11:42:56.000000000 +0200
+++ nss-3.14.3/nss/coreconf/WIN32.mk 2013-04-09 11:04:28.264194326 +0200
@@ -87,7 +87,7 @@
GARBAGE += $(OBJDIR)/vc20.pdb $(OBJDIR)/vc40.pdb
XP_DEFINE += -DXP_PC
ifdef NS_USE_GCC
-LIB_SUFFIX = a
+LIB_SUFFIX = dll.a
else
LIB_SUFFIX = lib
endif
@@ -97,7 +97,7 @@
# The -mnop-fun-dllimport flag allows us to avoid a drawback of
# the dllimport attribute that a pointer to a function marked as
# dllimport cannot be used as as a constant address.
- OS_CFLAGS += -mwindows -mms-bitfields -mnop-fun-dllimport
+ OS_CFLAGS += -mwindows -mms-bitfields -mnop-fun-dllimport -D_WIN32_IE=0x0501 -U__MMX__ -U__SSE__ -U__SSE2__
_GEN_IMPORT_LIB=-Wl,--out-implib,$(IMPORT_LIBRARY)
DLLFLAGS += -mwindows -o $@ -shared -Wl,--export-all-symbols $(if $(IMPORT_LIBRARY),$(_GEN_IMPORT_LIB))
ifdef BUILD_OPT
--- nss-3.14.3/nss/coreconf/WINNT.mk 2012-11-14 02:14:07.000000000 +0100
+++ nss-3.14.3/nss/coreconf/WINNT.mk 2013-04-09 11:04:28.264194326 +0200
@@ -14,7 +14,7 @@
#
# Win NT needs -GT so that fibers can work
#
-OS_CFLAGS += -GT
+#OS_CFLAGS += -GT
# WINNT uses the lib prefix, Win95 doesn't
NSPR31_LIB_PREFIX = lib
--- nss-3.14.3/nss/cmd/crmftest/Makefile 2012-03-20 15:46:56.000000000 +0100
+++ nss-3.14.3/nss/cmd/crmftest/Makefile 2013-04-09 11:04:28.265194341 +0200
@@ -58,7 +58,7 @@
LDDIST = $(DIST)/lib
ifeq (,$(filter-out WIN%,$(OS_TARGET)))
-EXTRA_LIBS += $(LDDIST)/sectool.lib
+#EXTRA_LIBS += $(LDDIST)/sectool.lib
endif
include ../platrules.mk
--- nss-3.14.3/nss/cmd/pk11mode/Makefile 2012-03-20 15:47:13.000000000 +0100
+++ nss-3.14.3/nss/cmd/pk11mode/Makefile 2013-04-09 11:04:28.265194341 +0200
@@ -29,9 +29,9 @@
ifeq ($(OS_ARCH), WINNT)
EXTRA_LIBS += \
- $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4.$(LIB_SUFFIX) \
- $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4.$(LIB_SUFFIX) \
- $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)nspr4.$(LIB_SUFFIX) \
+ $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4$(IMPORT_LIB_SUFFIX) \
+ $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4$(IMPORT_LIB_SUFFIX) \
+ $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)nspr4$(IMPORT_LIB_SUFFIX) \
$(NULL)
else
--- nss-3.14.3/nss/cmd/platlibs.mk 2013-01-08 18:16:03.000000000 +0100
+++ nss-3.14.3/nss/cmd/platlibs.mk 2013-04-09 11:04:28.265194341 +0200
@@ -72,14 +72,13 @@
$(DIST)/lib/$(LIB_PREFIX)smime.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)ssl.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)nss.$(LIB_SUFFIX) \
- $(DIST)/lib/$(LIB_PREFIX)ssl.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)sectool.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)pkcs12.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)pkcs7.$(LIB_SUFFIX) \
- $(DIST)/lib/$(LIB_PREFIX)certhi.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)cryptohi.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)pk11wrap.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)certdb.$(LIB_SUFFIX) \
+ $(DIST)/lib/$(LIB_PREFIX)certhi.$(LIB_SUFFIX) \
$(SOFTOKENLIB) \
$(CRYPTOLIB) \
$(DIST)/lib/$(LIB_PREFIX)nsspki.$(LIB_SUFFIX) \
--- nss-3.14.3/nss/cmd/shlibsign/Makefile 2013-01-08 18:16:03.000000000 +0100
+++ nss-3.14.3/nss/cmd/shlibsign/Makefile 2013-04-09 11:04:28.265194341 +0200
@@ -27,9 +27,9 @@
ifeq ($(OS_ARCH), WINNT)
EXTRA_LIBS += \
- $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4.$(LIB_SUFFIX) \
- $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4.$(LIB_SUFFIX) \
- $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)nspr4.$(LIB_SUFFIX) \
+ $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4$(IMPORT_LIB_SUFFIX) \
+ $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4$(IMPORT_LIB_SUFFIX) \
+ $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)nspr4$(IMPORT_LIB_SUFFIX) \
$(NULL)
else
@@ -53,8 +53,8 @@
endif
CHECKLOC = $(CHECKLIBS:.$(DLL_SUFFIX)=.chk)
-MD_LIB_RELEASE_FILES = $(CHECKLOC)
-ALL_TRASH += $(CHECKLOC)
+MD_LIB_RELEASE_FILES = # $(CHECKLOC)
+#ALL_TRASH += $(CHECKLOC)
endif
#######################################################################
@@ -92,5 +92,5 @@
endif
endif
-libs install :: $(CHECKLOC)
+libs install :: #$(CHECKLOC)
--- nss-3.14.3/nss/cmd/shlibsign/mangle/Makefile 2012-03-20 15:47:18.000000000 +0100
+++ nss-3.14.3/nss/cmd/shlibsign/mangle/Makefile 2013-04-09 11:04:28.266194356 +0200
@@ -27,9 +27,9 @@
ifeq ($(OS_ARCH), WINNT)
EXTRA_LIBS += \
- $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4.$(LIB_SUFFIX) \
- $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4.$(LIB_SUFFIX) \
- $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)nspr4.$(LIB_SUFFIX) \
+ $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4$(IMPORT_LIB_SUFFIX) \
+ $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4$(IMPORT_LIB_SUFFIX) \
+ $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)nspr4$(IMPORT_LIB_SUFFIX) \
$(NULL)
else
--- nss-3.14.3/nss/lib/ckfw/builtins/config.mk 2012-11-30 03:40:52.000000000 +0100
+++ nss-3.14.3/nss/lib/ckfw/builtins/config.mk 2013-04-09 11:04:28.266194356 +0200
@@ -16,7 +16,7 @@
ifeq (,$(filter-out WIN%,$(OS_TARGET)))
SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
- RES = $(OBJDIR)/$(LIBRARY_NAME).res
+ RES = $(OBJDIR)/$(LIBRARY_NAME).res.o
RESNAME = $(LIBRARY_NAME).rc
endif
--- nss-3.14.3/nss/lib/ckfw/capi/Makefile 2012-04-25 16:49:30.000000000 +0200
+++ nss-3.14.3/nss/lib/ckfw/capi/Makefile 2013-04-09 11:04:28.266194356 +0200
@@ -43,6 +43,9 @@
-lplc4 \
-lplds4 \
-lnspr4 \
+ -lcrypt32 \
+ -ladvapi32 \
+ -lrpcrt4 \
$(NULL)
endif
--- nss-3.14.3/nss/lib/freebl/config.mk 2012-11-14 02:14:10.000000000 +0100
+++ nss-3.14.3/nss/lib/freebl/config.mk 2013-04-09 11:04:28.267194371 +0200
@@ -50,7 +50,7 @@
# don't want the 32 in the shared library name
SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
-RES = $(OBJDIR)/$(LIBRARY_NAME).res
+RES = $(OBJDIR)/$(LIBRARY_NAME).res.o
RESNAME = freebl.rc
ifdef NS_USE_GCC
--- nss-3.14.3/nss/lib/freebl/Makefile 2013-01-31 02:08:59.000000000 +0100
+++ nss-3.14.3/nss/lib/freebl/Makefile 2013-04-09 11:04:28.267194371 +0200
@@ -137,6 +137,17 @@
endif
endif
else
+# 64-bit Windows
+ifdef NS_USE_GCC
+ # win64/gcc - use the x86 code for now, skipping optimization
+ ifdef BUILD_OPT
+ OPTIMIZER += -Os
+ endif
+ ASFILES =
+ DEFINES += -DMPI_AMD64 -DMP_USE_UINT_DIGIT
+ DEFINES += -DMP_CHAR_STORE_SLOW -DMP_IS_LITTLE_ENDIAN
+else
+# MSVC
# -DMP_NO_MP_WORD
DEFINES += -DMP_CHAR_STORE_SLOW -DMP_IS_LITTLE_ENDIAN
ifdef NS_USE_GCC
@@ -154,6 +165,7 @@
endif
endif
endif
+endif
ifeq ($(OS_TARGET),IRIX)
ifeq ($(USE_N32),1)
--- nss-3.14.3/nss/lib/freebl/mpi/mpi-priv.h 2012-04-25 16:49:50.000000000 +0200
+++ nss-3.14.3/nss/lib/freebl/mpi/mpi-priv.h 2013-04-09 11:04:28.267194371 +0200
@@ -221,7 +221,7 @@
#define MPI_ASM_DECL
#endif
-#ifdef MPI_AMD64
+#if defined(MPI_AMD64) && defined(MP_ASSEMBLY_MULTIPLY)
mp_digit MPI_ASM_DECL s_mpv_mul_set_vec64(mp_digit*, mp_digit *, mp_size, mp_digit);
mp_digit MPI_ASM_DECL s_mpv_mul_add_vec64(mp_digit*, const mp_digit*, mp_size, mp_digit);
--- nss-3.14.3/nss/lib/nss/config.mk 2012-04-25 16:50:03.000000000 +0200
+++ nss-3.14.3/nss/lib/nss/config.mk 2013-04-09 11:04:28.267194371 +0200
@@ -10,7 +10,7 @@
SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)
-RES = $(OBJDIR)/$(LIBRARY_NAME).res
+RES = $(OBJDIR)/$(LIBRARY_NAME).res.o
RESNAME = $(LIBRARY_NAME).rc
ifdef NS_USE_GCC
--- nss-3.14.3/nss/lib/smime/config.mk 2012-04-25 16:50:09.000000000 +0200
+++ nss-3.14.3/nss/lib/smime/config.mk 2013-04-09 11:04:28.267194371 +0200
@@ -11,7 +11,7 @@
SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)
-RES = $(OBJDIR)/smime.res
+RES = $(OBJDIR)/smime.res.o
RESNAME = smime.rc
ifdef NS_USE_GCC
--- nss-3.14.3/nss/lib/softoken/config.mk 2012-11-14 02:14:11.000000000 +0100
+++ nss-3.14.3/nss/lib/softoken/config.mk 2013-04-09 11:04:28.268194387 +0200
@@ -17,7 +17,7 @@
SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)
-RES = $(OBJDIR)/$(LIBRARY_NAME).res
+RES = $(OBJDIR)/$(LIBRARY_NAME).res.o
RESNAME = $(LIBRARY_NAME).rc
ifdef NS_USE_GCC
--- nss-3.14.3/nss/lib/softoken/legacydb/config.mk 2012-11-14 02:14:11.000000000 +0100
+++ nss-3.14.3/nss/lib/softoken/legacydb/config.mk 2013-04-09 11:04:28.268194387 +0200
@@ -18,7 +18,7 @@
SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)
-RES = $(OBJDIR)/$(LIBRARY_NAME).res
+RES = $(OBJDIR)/$(LIBRARY_NAME).res.o
RESNAME = $(LIBRARY_NAME).rc
ifdef NS_USE_GCC
--- nss-3.14.3/nss/lib/ssl/config.mk 2012-06-11 04:38:30.000000000 +0200
+++ nss-3.14.3/nss/lib/ssl/config.mk 2013-04-09 11:04:28.268194387 +0200
@@ -27,7 +27,7 @@
SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)
-RES = $(OBJDIR)/ssl.res
+RES = $(OBJDIR)/ssl.res.o
RESNAME = ssl.rc
ifdef NS_USE_GCC
--- nss-3.14.3/nss/lib/sysinit/config.mk 2012-04-25 16:50:15.000000000 +0200
+++ nss-3.14.3/nss/lib/sysinit/config.mk 2013-04-09 11:04:28.268194387 +0200
@@ -15,8 +15,8 @@
SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)
-RES = $(OBJDIR)/$(LIBRARY_NAME).res
-RESNAME = $(LIBRARY_NAME).rc
+#RES = $(OBJDIR)/$(LIBRARY_NAME).res
+#RESNAME = $(LIBRARY_NAME).rc
ifdef NS_USE_GCC
EXTRA_SHARED_LIBS += \
--- nss-3.14.3/nss/lib/util/config.mk 2012-04-25 16:50:16.000000000 +0200
+++ nss-3.14.3/nss/lib/util/config.mk 2013-04-09 11:04:28.268194387 +0200
@@ -10,7 +10,7 @@
SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)
-RES = $(OBJDIR)/$(LIBRARY_NAME).res
+RES = $(OBJDIR)/$(LIBRARY_NAME).res.o
RESNAME = $(LIBRARY_NAME).rc
ifdef NS_USE_GCC
Reference in New Issue View Git Blame Copy Permalink