Fix Windows cygwin build NSS_PERFORMANCE_HACKS_BRANCH
authorjulien.pierre.bugs%sun.com
Tue, 16 Aug 2005 06:48:53 +0000
branchNSS_PERFORMANCE_HACKS_BRANCH
changeset 6005 aec3a85ccad1030140ee388109ee7908b2cac9e2
parent 6004 7f7de13920613c9e3f12873e4b44f614a067ae50
child 6011 a9c076ed98fc9ef9d2db4350921b20d3bcd5a0b3
push idunknown
push userunknown
push dateunknown
Fix Windows cygwin build Add DEF file for freebl on Windows and OS/2
security/nss/lib/freebl/Makefile
security/nss/lib/freebl/freebl.def
security/nss/lib/freebl/manifest.mn
--- a/security/nss/lib/freebl/Makefile
+++ b/security/nss/lib/freebl/Makefile
@@ -413,17 +413,17 @@ endif
 ifndef FREEBL_CHILD_BUILD
 
 # Parent build. This is where we decide which shared libraries to build
 
 CDDIR := $(shell pwd)
 FILES2LN = \
  $(wildcard *.tab) \
  $(wildcard mapfile.*) \
- Makefile manifest.mn config.mk 
+ Makefile manifest.mn config.mk freebl.def
 
 ifdef FREEBL_BUILD_SINGLE_SHLIB
 
 ################### Single ABI stuff #########################
 SINGLE_SHLIB_DIR = $(OBJDIR)/$(OS_TARGET)_SINGLE_SHLIB
 SINGLE_SHLIB_FILES = $(addprefix $(SINGLE_SHLIB_DIR)/, $(FILES2LN))
 ALL_TRASH += $(SINGLE_SHLIB_DIR) 
 
@@ -431,17 +431,17 @@ ALL_TRASH += $(SINGLE_SHLIB_DIR)
 	-mkdir $(SINGLE_SHLIB_DIR)
 	-$(LN_S) $(CDDIR)/mpi $(SINGLE_SHLIB_DIR)
 
 $(SINGLE_SHLIB_FILES) : $(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 \
- FREEBL_PARENT=$(CDDIR) CORE_DEPTH=$(CDDIR)/$(CORE_DEPTH) libs
+ FREEBL_PARENT=../.. CORE_DEPTH=../../$(CORE_DEPTH) libs
 ######################## common stuff #########################
 
 else
 
 # multiple ABIs
 
 ifndef USE_64 
 
new file mode 100644
--- /dev/null
+++ b/security/nss/lib/freebl/freebl.def
@@ -0,0 +1,58 @@
+;+#
+;+# ***** BEGIN LICENSE BLOCK *****
+;+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+;+#
+;+# The contents of this file are subject to the Mozilla Public License Version
+;+# 1.1 (the "License"); you may not use this file except in compliance with
+;+# the License. You may obtain a copy of the License at
+;+# http://www.mozilla.org/MPL/
+;+#
+;+# Software distributed under the License is distributed on an "AS IS" basis,
+;+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+;+# for the specific language governing rights and limitations under the
+;+# License.
+;+#
+;+# The Original Code is the Netscape security libraries.
+;+#
+;+# The Initial Developer of the Original Code is
+;+# Netscape Communications Corporation.
+;+# Portions created by the Initial Developer are Copyright (C) 2000
+;+# the Initial Developer. All Rights Reserved.
+;+#
+;+# Contributor(s):
+;+#
+;+# Alternatively, the contents of this file may be used under the terms of
+;+# either the GNU General Public License Version 2 or later (the "GPL"), or
+;+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+;+# in which case the provisions of the GPL or the LGPL are applicable instead
+;+# of those above. If you wish to allow use of your version of this file only
+;+# under the terms of either the GPL or the LGPL, and not to allow others to
+;+# use your version of this file under the terms of the MPL, indicate your
+;+# decision by deleting the provisions above and replace them with the notice
+;+# and other provisions required by the GPL or the LGPL. If you do not delete
+;+# the provisions above, a recipient may use your version of this file under
+;+# the terms of any one of the MPL, the GPL or the LGPL.
+;+#
+;+# ***** END LICENSE BLOCK *****
+;+#
+;+# OK, this file is meant to support SUN, LINUX, AIX and WINDOWS
+;+#   1. For all unix platforms, the string ";-"  means "remove this line"
+;+#   2. For all unix platforms, the string " DATA " will be removed from any 
+;+#	line on which it occurs.
+;+#   3. Lines containing ";+" will have ";+" removed on SUN and LINUX.
+;+#      On AIX, lines containing ";+" will be removed.  
+;+#   4. For all unix platforms, the string ";;" will thave the ";;" removed.
+;+#   5. For all unix platforms, after the above processing has taken place,
+;+#    all characters after the first ";" on the line will be removed.  
+;+#    And for AIX, the first ";" will also be removed.
+;+#  This file is passed directly to windows. Since ';' is a comment, all UNIX
+;+#   directives are hidden behind ";", ";+", and ";-"
+;+
+;+NSS_3.11 {               # NSS 3.11 release
+;+    global:
+LIBRARY freebl_3 ;-
+EXPORTS	;-
+FREEBL_GetVector;
+;+    local:
+;+       *;
+;+};
--- a/security/nss/lib/freebl/manifest.mn
+++ b/security/nss/lib/freebl/manifest.mn
@@ -41,16 +41,17 @@
 # NOTE: any ifdefs in this file must be defined on the gmake command line
 # (if anywhere).  They cannot come from Makefile or config.mk 
 
 CORE_DEPTH = ../../..
 
 MODULE = nss
 
 ifdef FREEBL_CHILD_BUILD
+MAPFILE = $(OBJDIR)/freebl.def
   ifdef USE_ABI32_INT32
     LIBRARY_NAME = freebl_32int
   endif
   ifdef USE_ABI32_INT64
     LIBRARY_NAME = freebl_32int64
   endif
   ifdef USE_ABI32_FPU
     LIBRARY_NAME = freebl_32fpu