Fix building of freebl shared libs on Solaris. Wrong def file name was used NSS_PERFORMANCE_HACKS_BRANCH
authorjulien.pierre.bugs%sun.com
Tue, 16 Aug 2005 23:49:31 +0000
branchNSS_PERFORMANCE_HACKS_BRANCH
changeset 6013 02dbef042c94a71f7c972ac5a02c3671022bf49e
parent 6012 135e1bae64eff2441e9585088159ca9f572c276c
child 6027 998da0f10dad74830767423a70a86b8f549b9d8d
push idunknown
push userunknown
push dateunknown
Fix building of freebl shared libs on Solaris. Wrong def file name was used
security/nss/lib/freebl/Makefile
security/nss/lib/freebl/manifest.mn
--- a/security/nss/lib/freebl/Makefile
+++ b/security/nss/lib/freebl/Makefile
@@ -215,22 +215,22 @@ endif
 # Note: -xarch=v8 or v9 is now done in coreconf
 ifeq ($(OS_TARGET),SunOS)
 
 # The -R '$ORIGIN' linker option instructs this library to search for its
 # dependencies in the same directory where it resides.
 MKSHLIB += -R '$$ORIGIN'
 ifdef NS_USE_GCC
   ifdef GCC_USE_GNU_LD
-    MKSHLIB += -Wl,-Bsymbolic,-z,defs,-z,now,-z,text,--version-script,mapfile.Solaris
+    MKSHLIB += -Wl,-Bsymbolic,-z,defs,-z,now,-z,text,--version-script
   else
-    MKSHLIB += -Wl,-B,symbolic,-z,defs,-z,now,-z,text,-M,mapfile.Solaris
+    MKSHLIB += -Wl,-B,symbolic,-z,defs,-z,now,-z,text
   endif # GCC_USE_GNU_LD
 else
-  MKSHLIB += -B symbolic -z defs -z now -z text -M mapfile.Solaris
+  MKSHLIB += -B symbolic -z defs -z now -z text
 endif # NS_USE_GCC
 
 ifeq ($(CPU_ARCH),sparc)
     FREEBL_BUILD_SINGLE_SHLIB=
     ifdef USE_64
         HAVE_ABI64_INT=1
         HAVE_ABI64_FPU=1
     else
--- a/security/nss/lib/freebl/manifest.mn
+++ b/security/nss/lib/freebl/manifest.mn
@@ -41,17 +41,16 @@
 # 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
@@ -62,16 +61,21 @@ MAPFILE = $(OBJDIR)/freebl.def
   ifdef USE_ABI64_FPU
     LIBRARY_NAME = freebl_64fpu
   endif
 endif
 ifndef LIBRARY_NAME
   LIBRARY_NAME = freebl
 endif
 
+$(LIBRARY_NAME).def: freebl.def
+	cp freebl.def $(LIBRARY_NAME).def
+
+MAPFILE = $(OBJDIR)/freebl.def
+
 # same version as rest of NSS
 LIBRARY_VERSION = _3
 
 DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\"
 
 REQUIRES = 
 
 EXPORTS = \