Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:Guillaume_G:WSL
mingw64-mozilla-nss
nss-build.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File nss-build.patch of Package mingw64-mozilla-nss
--- nss-3.17.1/nss/cmd/crmftest/Makefile 2014-09-23 21:09:22.000000000 +0200 +++ nss-3.17.1/nss/cmd/crmftest/Makefile 2014-10-03 12:57:19.715776517 +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.17.1/nss/cmd/pk11mode/Makefile 2014-09-23 21:09:22.000000000 +0200 +++ nss-3.17.1/nss/cmd/pk11mode/Makefile 2014-10-03 12:57:19.715776517 +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.17.1/nss/cmd/shlibsign/Makefile 2014-09-23 21:09:22.000000000 +0200 +++ nss-3.17.1/nss/cmd/shlibsign/Makefile 2014-10-03 12:58:03.115792965 +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 @@ -56,8 +56,8 @@ endif CHECKLOC = $(CHECKLIBS:.$(DLL_SUFFIX)=.chk) -MD_LIB_RELEASE_FILES = $(CHECKLOC) -ALL_TRASH += $(CHECKLOC) +MD_LIB_RELEASE_FILES = # $(CHECKLOC) +#ALL_TRASH += $(CHECKLOC) endif ####################################################################### @@ -95,5 +95,5 @@ endif endif -libs install :: $(CHECKLOC) +libs install :: #$(CHECKLOC) --- nss-3.17.1/nss/cmd/shlibsign/mangle/Makefile 2014-09-23 21:09:22.000000000 +0200 +++ nss-3.17.1/nss/cmd/shlibsign/mangle/Makefile 2014-10-03 12:57:19.716776496 +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.17.1/nss/coreconf/rules.mk 2014-09-23 21:09:22.000000000 +0200 +++ nss-3.17.1/nss/coreconf/rules.mk 2014-10-03 12:57:19.714776541 +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.17.1/nss/coreconf/WIN32.mk 2014-09-23 21:09:22.000000000 +0200 +++ nss-3.17.1/nss/coreconf/WIN32.mk 2014-10-03 12:57:19.714776541 +0200 @@ -106,7 +106,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 += -mms-bitfields -mnop-fun-dllimport -D_WIN32_IE=0x0501 -U__MMX__ -U__SSE__ -U__SSE2__ -D__CRT__NO_INLINE=1 -D_WSTRING_S_DEFINED=1 _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.17.1/nss/coreconf/WINNT.mk 2014-09-23 21:09:22.000000000 +0200 +++ nss-3.17.1/nss/coreconf/WINNT.mk 2014-10-03 12:57:19.715776517 +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.17.1/nss/lib/ckfw/builtins/config.mk 2014-09-23 21:09:22.000000000 +0200 +++ nss-3.17.1/nss/lib/ckfw/builtins/config.mk 2014-10-03 12:57:19.716776496 +0200 @@ -15,7 +15,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.17.1/nss/lib/ckfw/capi/Makefile 2014-09-23 21:09:22.000000000 +0200 +++ nss-3.17.1/nss/lib/ckfw/capi/Makefile 2014-10-03 12:57:19.716776496 +0200 @@ -42,6 +42,9 @@ -lplc4 \ -lplds4 \ -lnspr4 \ + -lcrypt32 \ + -ladvapi32 \ + -lrpcrt4 \ $(NULL) endif --- nss-3.17.1/nss/lib/freebl/config.mk 2014-09-23 21:09:22.000000000 +0200 +++ nss-3.17.1/nss/lib/freebl/config.mk 2014-10-03 12:57:19.716776496 +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.17.1/nss/lib/freebl/Makefile 2014-09-23 21:09:22.000000000 +0200 +++ nss-3.17.1/nss/lib/freebl/Makefile 2014-10-03 12:57:19.717776476 +0200 @@ -147,6 +147,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 @@ -171,6 +182,7 @@ endif endif endif +endif ifeq ($(OS_TARGET),IRIX) ifeq ($(USE_N32),1) --- nss-3.17.1/nss/lib/freebl/mpi/mpi-priv.h 2014-09-23 21:09:22.000000000 +0200 +++ nss-3.17.1/nss/lib/freebl/mpi/mpi-priv.h 2014-10-03 12:57:19.717776476 +0200 @@ -220,7 +220,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.17.1/nss/lib/nss/config.mk 2014-09-23 21:09:22.000000000 +0200 +++ nss-3.17.1/nss/lib/nss/config.mk 2014-10-03 12:57:19.717776476 +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.17.1/nss/lib/smime/config.mk 2014-09-23 21:09:22.000000000 +0200 +++ nss-3.17.1/nss/lib/smime/config.mk 2014-10-03 12:57:19.718776454 +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.17.1/nss/lib/softoken/config.mk 2014-09-23 21:09:22.000000000 +0200 +++ nss-3.17.1/nss/lib/softoken/config.mk 2014-10-03 12:57:19.718776454 +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.17.1/nss/lib/softoken/legacydb/config.mk 2014-09-23 21:09:22.000000000 +0200 +++ nss-3.17.1/nss/lib/softoken/legacydb/config.mk 2014-10-03 12:57:19.718776454 +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.17.1/nss/lib/ssl/config.mk 2014-09-23 21:09:22.000000000 +0200 +++ nss-3.17.1/nss/lib/ssl/config.mk 2014-10-03 12:57:19.718776454 +0200 @@ -28,7 +28,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.17.1/nss/lib/sysinit/config.mk 2014-09-23 21:09:22.000000000 +0200 +++ nss-3.17.1/nss/lib/sysinit/config.mk 2014-10-03 12:57:19.719776431 +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.17.1/nss/lib/util/config.mk 2014-09-23 21:09:22.000000000 +0200 +++ nss-3.17.1/nss/lib/util/config.mk 2014-10-03 12:57:19.719776431 +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
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
