Author: rmeggins
Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15404
Modified Files:
nsconfig.mk
Log Message:
Wan-Teh pointed out that the platform specific freebl libs are needed _instead of_
libfreebl3, not _in addition to_. So, set the list of platform specific freebl libs and
add them to the list of libs to package.
Index: nsconfig.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/nsconfig.mk,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- nsconfig.mk 13 Feb 2006 22:09:55 -0000 1.22
+++ nsconfig.mk 14 Feb 2006 04:26:28 -0000 1.23
@@ -721,30 +721,27 @@
# where secmod.db file is, rather than in the LD_LIBRARY_PATH
SECURITY_SECMODDB_RUNTIME_LIBNAME = nssckbi
-# These files are only needed at runtime, not to link with
-SECURITY_EXTRA_RUNTIME_LIBNAMES = softokn3 freebl3
-# these shared libs need the corresponding .chk files at runtime
-SECURITY_NEED_CHK = softokn3 freebl3
-
-ifneq ($(USE_64), 1)
+# freebl for all platforms is new for NSS 3.11
+# there are some platform specific versions as well
+FREEBL_LIBS = freebl3
+ifeq ($(USE_64), 1)
+ifeq ($(ARCH), SOLARIS)
+FREEBL_LIBS = freebl_64fpu_3 freebl_64int_3
+endif
+else # USE_64
ifeq ($(ARCH), SOLARIS)
-SECURITY_EXTRA_RUNTIME_LIBNAMES += freebl_32fpu_3 freebl_32int64_3 freebl_32int_3
-# these libs have a corresponding .chk file
-SECURITY_NEED_CHK += freebl_32fpu_3 freebl_32int64_3 freebl_32int_3
+FREEBL_LIBS = freebl_32fpu_3 freebl_32int64_3 freebl_32int_3
endif # SOLARIS
ifeq ($(ARCH), HPUX)
-SECURITY_EXTRA_RUNTIME_LIBNAMES += freebl_32fpu_3 freebl_32int_3
-# these libs have a corresponding .chk file
-SECURITY_NEED_CHK += freebl_32fpu_3 freebl_32int_3
+FREEBL_LIBS = freebl_32fpu_3 freebl_32int_3
endif # HPUX
-else # USE_64
-ifeq ($(ARCH), SOLARIS)
-SECURITY_EXTRA_RUNTIME_LIBNAMES += freebl_64fpu_3 freebl_64int_3
-# these libs have a corresponding .chk file
-SECURITY_NEED_CHK += freebl_64fpu_3 freebl_64int_3
-endif
endif # USE_64
+# These files are only needed at runtime, not to link with
+SECURITY_EXTRA_RUNTIME_LIBNAMES = softokn3 $(FREEBL_LIBS)
+# these shared libs need the corresponding .chk files at runtime
+SECURITY_NEED_CHK = softokn3 $(FREEBL_LIBS)
+
ifeq ($(ARCH), WINNT)
SECURITYDLL_NAME = $(SECURITY_LIBNAMES)
SECURITYOBJNAME = $(addsuffix .lib, $(SECURITY_LIBNAMES))
Show replies by date