Additional code to builds freebl shared lib on windows with MKS.

On hacks branch.  Modified Files: Makefile config.mk

2 files changed, 47 insertions, 17 deletions

diff --git a/security/nss/lib/freebl/Makefile b/security/nss/lib/freebl/Makefile
index c6252c41a..82b52b30e 100644
--- a/security/nss/lib/freebl/Makefile
+++ b/security/nss/lib/freebl/Makefile
@@ -102,6 +102,7 @@ ifdef NS_USE_GCC
     ASFILES  =
     DEFINES += -DMP_NO_MP_WORD -DMP_USE_UINT_DIGIT
 else
+    LN_S     = cp
     ASFILES  = mpi_x86.asm
     DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE 
     DEFINES += -DMP_ASSEMBLY_DIV_2DX1D -DMP_USE_UINT_DIGIT -DMP_NO_MP_WORD
@@ -401,6 +402,10 @@ $(OBJDIR)/mpmontg.o: mpmontg.c montmulf.h
 
 endif
 
+ifndef LN_S
+LN_S = ln -s
+endif
+
 ifndef FREEBL_CHILD_BUILD
 
 # Parent build. This is where we decide which shared libraries to build
@@ -420,10 +425,10 @@ ALL_TRASH += $(SINGLE_SHLIB_DIR)
 
 $(SINGLE_SHLIB_DIR):
 	-mkdir $(SINGLE_SHLIB_DIR)
-	-ln -s $(CDDIR)/mpi $(SINGLE_SHLIB_DIR)
+	-$(LN_S) $(CDDIR)/mpi $(SINGLE_SHLIB_DIR)
 
 $(SINGLE_SHLIB_FILES) : $(SINGLE_SHLIB_DIR)/% : % 
-	ln -s $(CDDIR)/$* $(SINGLE_SHLIB_DIR)
+	$(LN_S) $(CDDIR)/$* $(SINGLE_SHLIB_DIR)
 
 libs:: $(SINGLE_SHLIB_DIR) $(SINGLE_SHLIB_FILES)
 	cd $(SINGLE_SHLIB_DIR) && $(MAKE) FREEBL_CHILD_BUILD=1 \
@@ -444,10 +449,10 @@ ALL_TRASH += $(ABI32_FPU_DIR)
 
 $(ABI32_FPU_DIR):
 	-mkdir $(ABI32_FPU_DIR)
-	-ln -s $(CDDIR)/mpi $(ABI32_FPU_DIR)
+	-$(LN_S) $(CDDIR)/mpi $(ABI32_FPU_DIR)
 
 $(ABI32_FPU_FILES) : $(ABI32_FPU_DIR)/% : % 
-	ln -s $(CDDIR)/$* $(ABI32_FPU_DIR)
+	$(LN_S) $(CDDIR)/$* $(ABI32_FPU_DIR)
 
 libs:: $(ABI32_FPU_DIR) $(ABI32_FPU_FILES)
 	cd $(ABI32_FPU_DIR) && $(MAKE) FREEBL_CHILD_BUILD=1 USE_ABI32_FPU=1 \
@@ -462,10 +467,10 @@ ALL_TRASH += $(ABI32_INT32_DIR)
 
 $(ABI32_INT32_DIR):
 	-mkdir $(ABI32_INT32_DIR)
-	-ln -s $(CDDIR)/mpi $(ABI32_INT32_DIR)
+	-$(LN_S) $(CDDIR)/mpi $(ABI32_INT32_DIR)
 
 $(ABI32_INT32_FILES) : $(ABI32_INT32_DIR)/% : % 
-	ln -s $(CDDIR)/$* $(ABI32_INT32_DIR)
+	$(LN_S) $(CDDIR)/$* $(ABI32_INT32_DIR)
 
 libs:: $(ABI32_INT32_DIR) $(ABI32_INT32_FILES)
 	cd $(ABI32_INT32_DIR) && $(MAKE) FREEBL_CHILD_BUILD=1 USE_ABI32_INT32=1 \
@@ -480,10 +485,10 @@ ALL_TRASH += $(ABI32_INT64_DIR)
 
 $(ABI32_INT64_DIR):
 	-mkdir $(ABI32_INT64_DIR)
-	-ln -s $(CDDIR)/mpi $(ABI32_INT64_DIR)
+	-$(LN_S) $(CDDIR)/mpi $(ABI32_INT64_DIR)
 
 $(ABI32_INT64_FILES) : $(ABI32_INT64_DIR)/% : % 
-	ln -s $(CDDIR)/$* $(ABI32_INT64_DIR)
+	$(LN_S) $(CDDIR)/$* $(ABI32_INT64_DIR)
 
 libs:: $(ABI32_INT64_DIR) $(ABI32_INT64_FILES)
 	cd $(ABI32_INT64_DIR) && $(MAKE) FREEBL_CHILD_BUILD=1 USE_ABI32_INT64=1 \
@@ -502,10 +507,10 @@ ALL_TRASH += $(ABI64_FPU_DIR)
 
 $(ABI64_FPU_DIR):
 	-mkdir $(ABI64_FPU_DIR)
-	-ln -s $(CDDIR)/mpi $(ABI64_FPU_DIR)
+	-$(LN_S) $(CDDIR)/mpi $(ABI64_FPU_DIR)
 
 $(ABI64_FPU_FILES) : $(ABI64_FPU_DIR)/% : % 
-	ln -s $(CDDIR)/$* $(ABI64_FPU_DIR)
+	$(LN_S) $(CDDIR)/$* $(ABI64_FPU_DIR)
 
 libs:: $(ABI64_FPU_DIR) $(ABI64_FPU_FILES)
 	cd $(ABI64_FPU_DIR) && $(MAKE) FREEBL_CHILD_BUILD=1 USE_ABI64_FPU=1 \
@@ -520,10 +525,10 @@ ALL_TRASH += $(ABI64_INT_DIR)
 
 $(ABI64_INT_DIR):
 	-mkdir $(ABI64_INT_DIR)
-	-ln -s $(CDDIR)/mpi $(ABI64_INT_DIR)
+	-$(LN_S) $(CDDIR)/mpi $(ABI64_INT_DIR)
 
 $(ABI64_INT_FILES) : $(ABI64_INT_DIR)/% : % 
-	ln -s $(CDDIR)/$* $(ABI64_INT_DIR)
+	$(LN_S) $(CDDIR)/$* $(ABI64_INT_DIR)
 
 libs:: $(ABI64_INT_DIR) $(ABI64_INT_FILES)
 	cd $(ABI64_INT_DIR) && $(MAKE) FREEBL_CHILD_BUILD=1 USE_ABI64_INT=1 \
diff --git a/security/nss/lib/freebl/config.mk b/security/nss/lib/freebl/config.mk
index 3237c3182..cda4d94a3 100644
--- a/security/nss/lib/freebl/config.mk
+++ b/security/nss/lib/freebl/config.mk
@@ -91,13 +91,36 @@ TARGETS	     = $(SHARED_LIBRARY)
 LIBRARY      =
 PROGRAM      =
 
-EXTRA_LIBS        += \
-	$(DIST)/lib/libsecutil.$(LIB_SUFFIX) \
+EXTRA_LIBS   += $(DIST)/lib/$(LIB_PREFIX)secutil.$(LIB_SUFFIX)
+
+ifeq (,$(filter-out WIN%,$(OS_TARGET)))
+
+# don't want the 32 in the shared library name
+SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
+IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)
+
+# do we need these?
+#RES = $(OBJDIR)/freebl.res
+#RESNAME = freebl.rc
+
+ifdef NS_USE_GCC
+EXTRA_SHARED_LIBS += \
+	-L$(DIST)/lib \
+	-lplc4 \
+	-lplds4 \
+	-lnspr4 \
+	-lc
+else # ! NS_USE_GCC
+EXTRA_SHARED_LIBS += \
+	$(DIST)/lib/$(NSPR31_LIB_PREFIX)plc4.lib \
+	$(DIST)/lib/$(NSPR31_LIB_PREFIX)plds4.lib \
+	$(DIST)/lib/$(NSPR31_LIB_PREFIX)nspr4.lib \
 	$(NULL)
+endif # NS_USE_GCC
+
+else
 
-# $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS)
-# $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX.
-  EXTRA_SHARED_LIBS += \
+EXTRA_SHARED_LIBS += \
 	-L$(DIST)/lib/ \
 	-lplc4 \
 	-lplds4 \
@@ -105,3 +128,5 @@ EXTRA_LIBS        += \
 	-lc
 
 endif
+
+endif