Bug 497251: Set FREEBL_NO_DEPEND to 0 to force a "depend" build. r=rrelyea. SOFTOKEN_3_13_BRANCH
authorwtc%google.com
Thu, 24 Jun 2010 17:54:00 +0000
branchSOFTOKEN_3_13_BRANCH
changeset 9693 1ea0fdcee656f1d54b1e4cbeae3c33c8d6e53cec
parent 9690 055994d0c57aacf80a9e7d95ab243db75154208d
child 13674 314e212d72bca8b502c5a5d2f46958de5d9048bf
push idunknown
push userunknown
push dateunknown
reviewersrrelyea
bugs497251
Bug 497251: Set FREEBL_NO_DEPEND to 0 to force a "depend" build. r=rrelyea. Modified Files: Tag: SOFTOKEN_3_13_BRANCH nss/lib/freebl/Makefile nss/lib/freebl/config.mk
security/nss/lib/freebl/Makefile
security/nss/lib/freebl/config.mk
--- a/security/nss/lib/freebl/Makefile
+++ b/security/nss/lib/freebl/Makefile
@@ -69,17 +69,17 @@ FREEBL_BUILD_SINGLE_SHLIB = 1
 ifdef USE_64
 	DEFINES += -DNSS_USE_64
 endif
 
 ifdef USE_ABI32_FPU
 	DEFINES += -DNSS_USE_ABI32_FPU
 endif
 
-ifdef FREEBL_NO_DEPEND
+ifeq ($(FREEBL_NO_DEPEND),1)
 	DEFINES += -DFREEBL_NO_DEPEND
 endif
 
 # FREEBL_USE_PRELINK
 #
 # Most modern version of Linux support a speed optimization scheme where an
 # application called prelink modifies programs and shared libraries to quickly
 # load if they fit into an already designed address space. In short, prelink
--- a/security/nss/lib/freebl/config.mk
+++ b/security/nss/lib/freebl/config.mk
@@ -61,17 +61,17 @@ ALL_TRASH :=    $(TARGETS) $(OBJS) $(OBJ
 # override these variables to prevent building a DSO/DLL.
   TARGETS        = $(LIBRARY)
   SHARED_LIBRARY =
   IMPORT_LIBRARY =
   PROGRAM        =
 
 else
 
-ifdef FREEBL_NO_DEPEND
+ifeq ($(FREEBL_NO_DEPEND),1)
 LOWHASH_SRCS = stubs.c nsslowhash.c
 LOWHASH_EXPORTS = nsslowhash.h
 MAPFILE_SOURCE = freebl_hash.def
 else
 MAPFILE_SOURCE = freebl.def
 endif
 
 # This is a recursive child make. We build the shared lib.
@@ -113,27 +113,27 @@ else # ! NS_USE_GCC
 EXTRA_SHARED_LIBS += \
 	$(DIST)/lib/nssutil3.lib \
 	$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)nspr4.lib \
 	$(NULL)
 endif # NS_USE_GCC
 
 else
 
-ifndef FREEBL_NO_DEPEND
+ifeq ($(FREEBL_NO_DEPEND),1)
+#drop pthreads as well
+OS_PTHREAD=
+else
 EXTRA_SHARED_LIBS += \
 	-L$(DIST)/lib \
 	-L$(NSSUTIL_LIB_DIR) \
 	-lnssutil3 \
 	-L$(NSPR_LIB_DIR) \
 	-lnspr4 \
 	$(NULL)
-else
-#drop pthreads as well
-OS_PTHREAD=
 endif
 endif
 
 ifeq ($(OS_ARCH), Darwin)
 EXTRA_SHARED_LIBS += -dylib_file @executable_path/libplc4.dylib:$(DIST)/lib/libplc4.dylib -dylib_file @executable_path/libplds4.dylib:$(DIST)/lib/libplds4.dylib
 endif
 
 endif