diff options
| author | Elio Maldonado <emaldona@redhat.com> | 2013-04-10 12:22:57 -0700 |
|---|---|---|
| committer | Elio Maldonado <emaldona@redhat.com> | 2013-04-10 12:22:57 -0700 |
| commit | d5f324eef1699ab5177df1f848f49f1355a2d073 (patch) | |
| tree | 31c2fa8e192bac87602fb5a4b572152b1e231061 /cmd/platlibs.mk | |
| parent | f5751eef41594717893f21834cb1ba1c225886f5 (diff) | |
| download | nss-hg-d5f324eef1699ab5177df1f848f49f1355a2d073.tar.gz | |
backout bug 835919, backout bug 850905
Diffstat (limited to 'cmd/platlibs.mk')
| -rw-r--r-- | cmd/platlibs.mk | 31 |
1 files changed, 3 insertions, 28 deletions
diff --git a/cmd/platlibs.mk b/cmd/platlibs.mk index 200faf701..332681dd4 100644 --- a/cmd/platlibs.mk +++ b/cmd/platlibs.mk @@ -36,18 +36,7 @@ ifdef USE_STATIC_LIBS DEFINES += -DNSS_USE_STATIC_LIBS # $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS) -ifndef USE_SYSTEM_FREEBL -CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl.$(LIB_SUFFIX) -SOFTOKENLIB=$(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX) -else -# Use the system freebl and softoken libraries -CRYPTOLIB=$(FREEBL_LIB_DIR)/$(LIB_PREFIX)freebl.$(LIB_SUFFIX) -SOFTOKENLIB= -EXTRA_SHARED_LIBS += \ - -L$(SOFTOKEN_LIB_DIR) \ - -lsoftokn3 \ - $(NULL) -endif +CRYPTOLIB=$(SOFTOKEN_LIB_DIR)/$(LIB_PREFIX)freebl.$(LIB_SUFFIX) PKIXLIB = \ $(DIST)/lib/$(LIB_PREFIX)pkixtop.$(LIB_SUFFIX) \ @@ -78,7 +67,7 @@ EXTRA_LIBS += \ $(DIST)/lib/$(LIB_PREFIX)cryptohi.$(LIB_SUFFIX) \ $(DIST)/lib/$(LIB_PREFIX)pk11wrap.$(LIB_SUFFIX) \ $(DIST)/lib/$(LIB_PREFIX)certdb.$(LIB_SUFFIX) \ - $(SOFTOKENLIB) \ + $(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX) \ $(CRYPTOLIB) \ $(DIST)/lib/$(LIB_PREFIX)nsspki.$(LIB_SUFFIX) \ $(DIST)/lib/$(LIB_PREFIX)nssdev.$(LIB_SUFFIX) \ @@ -113,7 +102,7 @@ EXTRA_LIBS += \ $(DIST)/lib/$(LIB_PREFIX)certhi.$(LIB_SUFFIX) \ $(DIST)/lib/$(LIB_PREFIX)nsspki.$(LIB_SUFFIX) \ $(DIST)/lib/$(LIB_PREFIX)pk11wrap.$(LIB_SUFFIX) \ - $(SOFTOKENLIB) \ + $(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX) \ $(DIST)/lib/$(LIB_PREFIX)certdb.$(LIB_SUFFIX) \ $(DIST)/lib/$(LIB_PREFIX)nsspki.$(LIB_SUFFIX) \ $(DIST)/lib/$(LIB_PREFIX)nssdev.$(LIB_SUFFIX) \ @@ -196,22 +185,8 @@ EXTRA_SHARED_LIBS += \ $(NULL) endif -ifdef SOFTOKEN_LIB_DIR -ifdef NSS_USE_SYSTEM_FREEBL -EXTRA_SHARED_LIBS += -L$(SOFTOKEN_LIB_DIR) -lsoftokn3 -endif -endif - endif # USE_STATIC_LIBS -# If a platform has a system freebl, set USE_SYSTEM_FREEBL to 1 and -# FREEBL_LIBS to the linker command-line arguments for the system nss-util -# (for example, -lfreebl3 on fedora) in the platform's config file in coreconf. -ifdef NSS_USE_SYSTEM_FREEBL -FREEBL_LIBS = $(FREEBL_LIB_DIR)/$(LIB_PREFIX)freebl.$(LIB_SUFFIX) -EXTRA_LIBS += $(FREEBL_LIBS) -endif - # If a platform has a system zlib, set USE_SYSTEM_ZLIB to 1 and # ZLIB_LIBS to the linker command-line arguments for the system zlib # (for example, -lz) in the platform's config file in coreconf. |