Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:rhabacker:branches:windows:mingw:win64
mingw64-mozilla-nspr
nspr-4.35-import-lib-fix.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File nspr-4.35-import-lib-fix.patch of Package mingw64-mozilla-nspr
diff -ur nspr-4.35.orig/nspr/config/autoconf.mk.in nspr-4.35/nspr/config/autoconf.mk.in --- nspr-4.35.orig/nspr/config/autoconf.mk.in 2022-09-12 13:40:15.000000000 +0200 +++ nspr-4.35/nspr/config/autoconf.mk.in 2023-07-31 18:42:20.068226871 +0200 @@ -32,6 +32,7 @@ OBJ_SUFFIX = $(error config/config.mk needs to be included before using OBJ_SUFFIX) _OBJ_SUFFIX = @OBJ_SUFFIX@ LIB_SUFFIX = @LIB_SUFFIX@ +IMPORT_LIB_SUFFIX = @IMPORT_LIB_SUFFIX@ DLL_SUFFIX = @DLL_SUFFIX@ ASM_SUFFIX = @ASM_SUFFIX@ MOD_NAME = @NSPR_MODNAME@ Nur in nspr-4.35/nspr/config: autoconf.mk.in.orig. diff -ur nspr-4.35.orig/nspr/config/rules.mk nspr-4.35/nspr/config/rules.mk --- nspr-4.35.orig/nspr/config/rules.mk 2022-09-12 13:40:15.000000000 +0200 +++ nspr-4.35/nspr/config/rules.mk 2023-07-31 18:44:19.190997687 +0200 @@ -85,16 +85,16 @@ SHARED_LIB_PDB = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).pdb ifdef MSC_VER LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION)_s.$(LIB_SUFFIX) -IMPORT_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).$(LIB_SUFFIX) +IMPORT_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).$(IMPORT_LIB_SUFFIX) else LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION)_s.$(LIB_SUFFIX) -IMPORT_LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(LIB_SUFFIX) +IMPORT_LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(IMPORT_LIB_SUFFIX) endif else SHARED_LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX) SHARED_LIB_PDB = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).pdb LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION)_s.$(LIB_SUFFIX) -IMPORT_LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(LIB_SUFFIX) +IMPORT_LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(IMPORT_LIB_SUFFIX) endif else Nur in nspr-4.35/nspr/config: rules.mk.orig. Nur in nspr-4.35/nspr/config: rules.mk.rej. diff -ur nspr-4.35.orig/nspr/configure nspr-4.35/nspr/configure --- nspr-4.35.orig/nspr/configure 2022-09-12 13:40:15.000000000 +0200 +++ nspr-4.35/nspr/configure 2023-07-31 18:50:14.509769138 +0200 @@ -5569,6 +5569,7 @@ OBJ_SUFFIX=o LIB_SUFFIX=a +IMPORT_LIB_SUFFIX=$(IMPORT_LIB_SUFFIX) DLL_SUFFIX=so ASM_SUFFIX=s MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@' @@ -6865,6 +6866,7 @@ CC="$CC -mwindows" CXX="$CXX -mwindows" DLL_SUFFIX=dll + IMPORT_LIB_SUFFIX=dll.a MKSHLIB='$(CC) -shared -Wl,--export-all-symbols -Wl,--out-implib -Wl,$(IMPORT_LIBRARY) $(DLLBASE) -o $(subst $(OBJDIR)/,,$(SHARED_LIBRARY))' RC=$WINDRES # Use temp file for windres (bug 213281) @@ -6879,6 +6881,7 @@ GARBAGE='$(OBJDIR)/vc20.pdb $(OBJDIR)/vc40.pdb' OBJ_SUFFIX=obj LIB_SUFFIX=lib + IMPORT_LIB_SUFFIX=lib DLL_SUFFIX=dll # Determine compiler version @@ -6997,11 +7000,11 @@ if test "$OS_TARGET" = "WINNT"; then CFLAGS="$CFLAGS -GT" - LIBNSPR='$(dist_libdir)/libnspr$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)' - LIBPLC='$(dist_libdir)/libplc$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)' + LIBNSPR='$(dist_libdir)/libnspr$(MOD_MAJOR_VERSION).$(IMPORT_LIB_SUFFIX)' + LIBPLC='$(dist_libdir)/libplc$(MOD_MAJOR_VERSION).$(IMPORT_LIB_SUFFIX)' else - LIBNSPR='$(dist_libdir)/nspr$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)' - LIBPLC='$(dist_libdir)/plc$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)' + LIBNSPR='$(dist_libdir)/nspr$(MOD_MAJOR_VERSION).$(IMPORT_LIB_SUFFIX)' + LIBPLC='$(dist_libdir)/plc$(MOD_MAJOR_VERSION).$(IMPORT_LIB_SUFFIX)' fi fi # GNU_CC @@ -7413,6 +7416,7 @@ $as_echo "#define TCPV40HDRS 1" >>confdefs.h LIB_SUFFIX=lib + IMPORT_LIB_SUFFIX=lib DLL_SUFFIX=dll RC=rc.exe PR_MD_ARCH_DIR=os2 diff -ur nspr-4.35.orig/nspr/configure.in nspr-4.35/nspr/configure.in --- nspr-4.35.orig/nspr/configure.in 2022-09-12 13:40:15.000000000 +0200 +++ nspr-4.35/nspr/configure.in 2023-07-31 18:42:20.068226871 +0200 @@ -803,6 +803,7 @@ dnl ======================================================== OBJ_SUFFIX=o LIB_SUFFIX=a +IMPORT_LIB_SUFFIX=$(IMPORT_LIB_SUFFIX) DLL_SUFFIX=so ASM_SUFFIX=s MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@' @@ -1726,6 +1727,7 @@ CC="$CC -mwindows" CXX="$CXX -mwindows" DLL_SUFFIX=dll + IMPORT_LIB_SUFFIX=dll.a MKSHLIB='$(CC) -shared -Wl,--export-all-symbols -Wl,--out-implib -Wl,$(IMPORT_LIBRARY) $(DLLBASE) -o $(subst $(OBJDIR)/,,$(SHARED_LIBRARY))' RC=$WINDRES # Use temp file for windres (bug 213281) @@ -1740,6 +1742,7 @@ GARBAGE='$(OBJDIR)/vc20.pdb $(OBJDIR)/vc40.pdb' OBJ_SUFFIX=obj LIB_SUFFIX=lib + IMPORT_LIB_SUFFIX=lib DLL_SUFFIX=dll # Determine compiler version @@ -1860,11 +1863,11 @@ if test "$OS_TARGET" = "WINNT"; then CFLAGS="$CFLAGS -GT" - LIBNSPR='$(dist_libdir)/libnspr$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)' - LIBPLC='$(dist_libdir)/libplc$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)' + LIBNSPR='$(dist_libdir)/libnspr$(MOD_MAJOR_VERSION).$(IMPORT_LIB_SUFFIX)' + LIBPLC='$(dist_libdir)/libplc$(MOD_MAJOR_VERSION).$(IMPORT_LIB_SUFFIX)' else - LIBNSPR='$(dist_libdir)/nspr$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)' - LIBPLC='$(dist_libdir)/plc$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)' + LIBNSPR='$(dist_libdir)/nspr$(MOD_MAJOR_VERSION).$(IMPORT_LIB_SUFFIX)' + LIBPLC='$(dist_libdir)/plc$(MOD_MAJOR_VERSION).$(IMPORT_LIB_SUFFIX)' fi fi # GNU_CC @@ -2216,6 +2219,7 @@ AC_DEFINE(BSD_SELECT) AC_DEFINE(TCPV40HDRS) LIB_SUFFIX=lib + IMPORT_LIB_SUFFIX=lib DLL_SUFFIX=dll RC=rc.exe PR_MD_ARCH_DIR=os2 @@ -2758,6 +2762,7 @@ AC_SUBST(OBJ_SUFFIX) AC_SUBST(LIB_SUFFIX) +AC_SUBST(IMPORT_LIB_SUFFIX) AC_SUBST(DLL_SUFFIX) AC_SUBST(ASM_SUFFIX) AC_SUBST(WRAP_LDFLAGS) Nur in nspr-4.35/nspr: configure.in.orig. Nur in nspr-4.35/nspr: configure.in.rej. Nur in nspr-4.35/nspr: configure.orig. Nur in nspr-4.35/nspr: configure.rej. diff -ur nspr-4.35.orig/nspr/pr/include/md/_win95.cfg nspr-4.35/nspr/pr/include/md/_win95.cfg --- nspr-4.35.orig/nspr/pr/include/md/_win95.cfg 2022-09-12 13:40:15.000000000 +0200 +++ nspr-4.35/nspr/pr/include/md/_win95.cfg 2023-07-31 18:42:20.068226871 +0200 @@ -68,7 +68,7 @@ #define PR_BYTES_PER_WORD_LOG2 2 #define PR_BYTES_PER_DWORD_LOG2 3 -#elif defined(_M_X64) || defined(_M_AMD64) || defined(_AMD64_) +#elif defined(_M_X64) || defined(_M_AMD64) || defined(_AMD64_) || defined (_WIN64) #define IS_LITTLE_ENDIAN 1 #undef IS_BIG_ENDIAN Nur in nspr-4.35/nspr/pr/include/md: _win95.cfg.orig. diff -ur nspr-4.35.orig/nspr/pr/include/md/_winnt.cfg nspr-4.35/nspr/pr/include/md/_winnt.cfg --- nspr-4.35.orig/nspr/pr/include/md/_winnt.cfg 2022-09-12 13:40:15.000000000 +0200 +++ nspr-4.35/nspr/pr/include/md/_winnt.cfg 2023-07-31 18:42:20.068226871 +0200 @@ -68,7 +68,7 @@ #define PR_BYTES_PER_WORD_LOG2 2 #define PR_BYTES_PER_DWORD_LOG2 2 -#elif defined(_M_X64) || defined(_M_AMD64) || defined(_AMD64_) +#elif defined(_M_X64) || defined(_M_AMD64) || defined(_AMD64_) || defined (_WIN64) #define IS_LITTLE_ENDIAN 1 #undef IS_BIG_ENDIAN Nur in nspr-4.35/nspr/pr/include/md: _winnt.cfg.orig. Nur in nspr-4.35/nspr/pr/src: Makefile.in.rej. diff -ur nspr-4.35.orig/nspr/pr/src/md/windows/ntgc.c nspr-4.35/nspr/pr/src/md/windows/ntgc.c --- nspr-4.35.orig/nspr/pr/src/md/windows/ntgc.c 2022-09-12 13:40:15.000000000 +0200 +++ nspr-4.35/nspr/pr/src/md/windows/ntgc.c 2023-07-31 18:42:27.892861770 +0200 @@ -12,7 +12,7 @@ PRWord *_MD_HomeGCRegisters(PRThread *t, int isCurrent, int *np) { -#if defined(_X86_) +#if defined(_X86_) && (!defined(_AMD64_)) CONTEXT context; context.ContextFlags = CONTEXT_INTEGER; Nur in nspr-4.35/nspr/pr/src/md/windows: ntgc.c.orig. Nur in nspr-4.35/nspr/tools: Makefile.in.orig. Nur in nspr-4.35/nspr/tools: Makefile.in.rej.
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
