File mingw64-mozilla-nspr-4.7.2-build.patch of Package mingw64-mozilla-nspr

Overview Repositories Revisions Requests Users Attributes Meta

File mingw64-mozilla-nspr-4.7.2-build.patch of Package mingw64-mozilla-nspr (Revision 467c45c3180860c1dae28497115cc570)

Currently displaying revision 467c45c3180860c1dae28497115cc570 , Show latest

--- pr/src/Makefile.in.orig	2008-11-10 16:34:55.000000000 +0000
+++ pr/src/Makefile.in	2008-11-10 17:12:24.000000000 +0000
@@ -193,9 +193,12 @@
 OS_LIBS		= -lsocket -lnsl -lgen -lresolv
 endif
 
-ifeq ($(OS_ARCH),WINNT)
+ifeq ($(OS_TARGET),WINNT)
 ifdef NS_USE_GCC
+IMPORT_LIBRARY  = libnspr4.a
+TARGETS        += libnspr4.a
-OS_LIBS		= -ladvapi32 -lwsock32 -lwinmm
+OS_LIBS		= -ladvapi32 -lws2_32 -lmswsock -lwinmm
+libnspr4.a: libnspr4.dll
 else
 OS_LIBS		= advapi32.lib wsock32.lib winmm.lib
 endif
--- lib/ds/Makefile.in.orig	2008-11-10 16:45:35.000000000 +0000
+++ lib/ds/Makefile.in	2008-11-10 17:12:51.000000000 +0000
@@ -62,10 +62,10 @@
 
 HEADERS := $(addprefix $(srcdir)/, $(HEADERS))
 
-ifeq ($(OS_ARCH), WINNT)
-RES=$(OBJDIR)/plds.res
-RESNAME=plds.rc
-endif # WINNT
+ifeq ($(OS_TARGET), WINNT)
+RES=$(OBJDIR)/plds.res.o
+RESNAME=plds.rc
+endif # WINNT
 
 ifeq ($(OS_ARCH), AIX)
 ifeq ($(CLASSIC_NSPR),1)
@@ -121,7 +121,10 @@
 endif
 
 LIBRARY_NAME	= plds
+IMPORT_LIBRARY  = libplds.a
+OS_LIBS         = -ladvapi32 -lws2_32 -lmswsock -lwinmm
 LIBRARY_VERSION	= $(MOD_MAJOR_VERSION)
+libplds.a: libplds.dll
 
 RELEASE_HEADERS = $(HEADERS)
 RELEASE_HEADERS_DEST = $(RELEASE_INCLUDE_DIR)
--- lib/libc/src/Makefile.in.orig	2008-11-10 16:55:40.000000000 +0000
+++ lib/libc/src/Makefile.in	2008-11-10 16:59:59.000000000 +0000
@@ -71,10 +71,17 @@
 
 RELEASE_LIBS = $(TARGETS)
 
-ifeq ($(OS_ARCH),WINNT)
-RES=$(OBJDIR)/plc.res
-RESNAME=plc.rc
-endif # WINNT
+ifeq ($(OS_TARGET),WINNT)
+IMPORT_LIBRARY  = libplc4.a
+TARGETS        += libplc4.a
+OS_LIBS		= -ladvapi32 -lws2_32 -lmswsock -lwinmm
+libplc4.a: libplc4.dll
+endif
+
+ifeq ($(OS_TARGET),WINNT)
+RES=$(OBJDIR)/plc.res.o
+RESNAME=plc.rc
+endif # WINNT
 
 ifeq ($(OS_ARCH), AIX)
 ifeq ($(CLASSIC_NSPR),1)
--- pr/include/prtypes.h	2008-07-19 18:56:11.000000000 +0200
+++ pr/include/prtypes.h	2009-01-08 08:35:53.000000000 +0100
@@ -465,7 +465,7 @@
 **      for storing a pointer or pointer sutraction. 
 ************************************************************************/
 #ifdef _WIN64
-typedef unsigned __int64 PRUptrdiff;
+typedef unsigned long long PRUptrdiff;
 #else
 typedef unsigned long PRUptrdiff;
 #endif
@@ -517,8 +517,8 @@
 ** http://java.sun.com/docs/books/vmspec/index.html.)
 */
 #ifdef _WIN64
-typedef __int64 PRWord;
-typedef unsigned __int64 PRUword;
+typedef long long PRWord;
+typedef unsigned long long PRUword;
 #else
 typedef long PRWord;
 typedef unsigned long PRUword;
--- pr/src/md/windows/ntgc.c	2005-10-21 20:21:42.000000000 +0200
+++ pr/src/md/windows/ntgc.c	2009-01-08 08:41:14.000000000 +0100
@@ -44,7 +44,7 @@
 
 PRWord *_MD_HomeGCRegisters(PRThread *t, int isCurrent, int *np) 
 {
-#if defined(_X86_)
+#if !defined(_WIN64)
     CONTEXT context;
     context.ContextFlags = CONTEXT_INTEGER;

Places

File mingw64-mozilla-nspr-4.7.2-build.patch of Package mingw64-mozilla-nspr (Revision 467c45c3180860c1dae28497115cc570)

Places