Attachment 643794 Details for Bug 689918 – patch build system files to build without softoken or util in the tree

[patch] patch build system files to build without softoken or util in the tree

Bug-689918-build-without-softoken.patch (text/plain), 11.39 KB, created by Elio Maldonado Batiz on 2012-11-12 22:30:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Elio Maldonado Batiz

Created: 2012-11-12 22:30:35 UTC

Size: 11.39 KB

patch

obsolete

>Index: ./mozilla/security/nss/Makefile
>===================================================================
>RCS file: /cvsroot/mozilla/security/nss/Makefile,v
>retrieving revision 1.41
>diff -u -p -r1.41 Makefile
>--- ./mozilla/security/nss/Makefile	28 Aug 2012 14:15:40 -0000	1.41
>+++ ./mozilla/security/nss/Makefile	12 Nov 2012 21:34:19 -0000
>@@ -152,6 +152,16 @@ nss_RelEng_bld: build_coreconf import bu
> package:
> 	$(MAKE) -C pkg publish
> 
>+# Copy softoken/freebl/nssdbm from the system if we didn't build them
>+copy_softoken_libs::
>+ifeq ($(OS_ARCH),Linux)
>+ifdef USE_SYSTEM_NSSUTIL
>+ifdef USE_SYSTEM_FREEBL
>+	(export DLL_PREFIX=lib; export DLL_SUFFIX=so export DIST=${DIST}; sh ./copy-softoken-libs.sh)
>+endif
>+endif
>+endif
>+
> TESTPACKAGE="nss-$(OS_TARGET)$(CPU_TAG).tgz"
> package_for_testing:
> 	echo "export OBJDIR=$(OBJDIR_NAME)"     > $(DIST)/platform.cfg
>Index: ./mozilla/security/nss/cmd/manifest.mn
>===================================================================
>RCS file: /cvsroot/mozilla/security/nss/cmd/manifest.mn,v
>retrieving revision 1.38
>diff -u -p -r1.38 manifest.mn
>--- ./mozilla/security/nss/cmd/manifest.mn	1 Sep 2012 18:29:28 -0000	1.38
>+++ ./mozilla/security/nss/cmd/manifest.mn	12 Nov 2012 21:34:19 -0000
>@@ -8,10 +8,22 @@ DEPTH	= ../..
> 
> REQUIRES = nss nspr libdbm
> 
>+# If using the the system freebl/softoken libraries bltest and fipstest
>+# have already been built and run as part of the nss-softokn build such
>+# as is the case with fedora and some derived dirtibutions.
>+
>+ifdef USE_SYSTEM_FREEBL
>+BLTEST=
>+FIPSTEST=
>+else
>+BLTEST=bltest
>+FIPSTEST=fipstest
>+endif
>+
> DIRS = lib  \
>  addbuiltin \
>  atob  \
>- bltest \
>+ $(BLTEST) \
>  btoa  \
>  certcgi \
>  certutil  \
>@@ -23,7 +35,7 @@ DIRS = lib  \
>  derdump  \
>  digest  \
>  httpserv  \
>- fipstest  \
>+ $(FIPSTEST)  \
>  $(LOWHASHTEST_SRCDIR)  \
>  listsuites \
>  makepqg  \
>Index: ./mozilla/security/nss/cmd/platlibs.mk
>===================================================================
>RCS file: /cvsroot/mozilla/security/nss/cmd/platlibs.mk,v
>retrieving revision 1.71
>diff -u -p -r1.71 platlibs.mk
>--- ./mozilla/security/nss/cmd/platlibs.mk	17 Jul 2012 15:22:42 -0000	1.71
>+++ ./mozilla/security/nss/cmd/platlibs.mk	12 Nov 2012 21:34:19 -0000
>@@ -36,7 +36,17 @@ ifdef USE_STATIC_LIBS
> 
> DEFINES += -DNSS_USE_STATIC_LIBS
> # $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
>+ifndef USE_SYSTEM_FREEBL
> CRYPTOLIB=$(SOFTOKEN_LIB_DIR)/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
>+else
>+# Use the system freebl and the system softoken shared library
>+CRYPTOLIB=$(FREEBL_LIB_DIR)/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
>+SOFTOKENLIB=
>+EXTRA_SHARED_LIBS += \
>+	-L$(SOFTOKEN_LIB_DIR) \
>+	-lsoftokn3 \
>+	$(NULL)
>+endif
> 
> PKIXLIB = \
> 	$(DIST)/lib/$(LIB_PREFIX)pkixtop.$(LIB_SUFFIX) \
>@@ -67,7 +77,7 @@ EXTRA_LIBS += \
> 	$(DIST)/lib/$(LIB_PREFIX)cryptohi.$(LIB_SUFFIX) \
> 	$(DIST)/lib/$(LIB_PREFIX)pk11wrap.$(LIB_SUFFIX) \
> 	$(DIST)/lib/$(LIB_PREFIX)certdb.$(LIB_SUFFIX) \
>-	$(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX) \
>+	$(SOFTOKENLIB) \
> 	$(CRYPTOLIB) \
> 	$(DIST)/lib/$(LIB_PREFIX)nsspki.$(LIB_SUFFIX) \
> 	$(DIST)/lib/$(LIB_PREFIX)nssdev.$(LIB_SUFFIX) \
>@@ -102,7 +112,7 @@ EXTRA_LIBS += \
> 	$(DIST)/lib/$(LIB_PREFIX)certhi.$(LIB_SUFFIX) \
> 	$(DIST)/lib/$(LIB_PREFIX)nsspki.$(LIB_SUFFIX) \
> 	$(DIST)/lib/$(LIB_PREFIX)pk11wrap.$(LIB_SUFFIX) \
>-	$(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX) \
>+	$(SOFTOKENLIB) \
> 	$(DIST)/lib/$(LIB_PREFIX)certdb.$(LIB_SUFFIX) \
> 	$(DIST)/lib/$(LIB_PREFIX)nsspki.$(LIB_SUFFIX) \
> 	$(DIST)/lib/$(LIB_PREFIX)nssdev.$(LIB_SUFFIX) \
>@@ -194,4 +204,17 @@ ifndef USE_SYSTEM_ZLIB
> ZLIB_LIBS = $(DIST)/lib/$(LIB_PREFIX)zlib.$(LIB_SUFFIX)
> endif
> 
>+# 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
>+
>+# The same as in location.mk
>+ifdef NSSUTIL_INCLUDE_DIR
>+    INCLUDES += -I$(NSSUTIL_INCLUDE_DIR)
>+endif
>+
> JAR_LIBS = $(DIST)/lib/$(LIB_PREFIX)jar.$(LIB_SUFFIX)
>Index: ./mozilla/security/nss/cmd/shlibsign/Makefile
>===================================================================
>RCS file: /cvsroot/mozilla/security/nss/cmd/shlibsign/Makefile,v
>retrieving revision 1.21
>diff -u -p -r1.21 Makefile
>--- ./mozilla/security/nss/cmd/shlibsign/Makefile	20 Mar 2012 14:47:18 -0000	1.21
>+++ ./mozilla/security/nss/cmd/shlibsign/Makefile	12 Nov 2012 21:34:19 -0000
>@@ -46,6 +46,12 @@ endif
> 
> # sign any and all shared libraries that contain the word freebl
> 
>+ifdef USE_SYSTEM_FREEBL
>+# but not if this is a build of nss without any soktoken sources
>+# present in the source tree because we have built it separately
>+CHECKLIBS=
>+CHECKLOC =
>+else
> CHECKLIBS = $(DIST)/lib/$(DLL_PREFIX)softokn3.$(DLL_SUFFIX)
> CHECKLIBS += $(wildcard $(DIST)/lib/$(DLL_PREFIX)freebl*3.$(DLL_SUFFIX))
> ifndef NSS_DISABLE_DBM
>@@ -55,7 +61,7 @@ CHECKLOC = $(CHECKLIBS:.$(DLL_SUFFIX)=.c
> 
> MD_LIB_RELEASE_FILES = $(CHECKLOC)
> ALL_TRASH += $(CHECKLOC)
>-
>+endif
> 
> #######################################################################
> # (5) Execute "global" rules. (OPTIONAL)                              #
>Index: ./mozilla/security/nss/lib/Makefile
>===================================================================
>RCS file: /cvsroot/mozilla/security/nss/lib/Makefile,v
>retrieving revision 1.17
>diff -u -p -r1.17 Makefile
>--- ./mozilla/security/nss/lib/Makefile	25 Apr 2012 14:49:24 -0000	1.17
>+++ ./mozilla/security/nss/lib/Makefile	12 Nov 2012 21:34:19 -0000
>@@ -58,3 +58,31 @@ include $(CORE_DEPTH)/coreconf/rules.mk
> # (7) Execute "local" rules. (OPTIONAL).                              #
> #######################################################################
> 
>+# By setting the USE_SYSTEM_NSSUTIL, USE_SYSTEM_FREEBL, and USE_SYSTEM_SOFTOKEN
>+# buiild tomew environment variables a downstream maintainer can opt to skip
>+# building util, freebl, and softoken.
>+#
>+# util may be installed in the system, as part of nss-util-devel
>+# as is the case with fedora and derived distributions
>+ifeq ($(OS_ARCH),Linux)
>+ifndef USE_SYSTEM_NSSUTIL
>+UTIL_SRCDIR = util  # Add the util directory to DIRS.
>+endif
>+endif
>+
>+# freebl may be installed in the system, perhaps as part of
>+# nss-softokn-freebl-devel as is the case with fedora.
>+# in fedora and hel
>+ifeq ($(OS_ARCH),Linux)
>+ifndef USE_SYSTEM_FREEBL
>+FREEBL_SRCDIR = freebl  # Add the freebl directory to DIRS.
>+endif
>+endif
>+
>+# softoken may be installed in the system, as part of nss-softokn-devel
>+# as is the case in fedora and derived distributions
>+ifeq ($(OS_ARCH),Linux)
>+ifndef USE_SYSTEM_SOFTOKEN
>+SOFTOKEN_SRCDIR = softoken  # Add the softoken directory to DIRS.
>+endif
>+endif
>Index: ./mozilla/security/nss/lib/manifest.mn
>===================================================================
>RCS file: /cvsroot/mozilla/security/nss/lib/manifest.mn,v
>retrieving revision 1.24
>diff -u -p -r1.24 manifest.mn
>--- ./mozilla/security/nss/lib/manifest.mn	25 Apr 2012 14:49:24 -0000	1.24
>+++ ./mozilla/security/nss/lib/manifest.mn	12 Nov 2012 21:34:19 -0000
>@@ -16,7 +16,7 @@ DEPTH      = ../..
> #  smime
> #  ckfw (builtins module)
> #  crmf jar (not dll's)
>-DIRS =  util freebl $(SQLITE_SRCDIR) softoken \
>+DIRS = $(UTIL_SRCDIR) $(FREEBL_SRCDIR) $(SQLITE_SRCDIR) $(SOFTOKEN_SRCDIR) \
> 	base dev pki \
> 	libpkix \
> 	certdb certhigh pk11wrap cryptohi nss \
>Index: ./mozilla/security/nss/lib/ssl/Makefile
>===================================================================
>RCS file: /cvsroot/mozilla/security/nss/lib/ssl/Makefile,v
>retrieving revision 1.11
>diff -u -p -r1.11 Makefile
>--- ./mozilla/security/nss/lib/ssl/Makefile	11 Jun 2012 02:38:30 -0000	1.11
>+++ ./mozilla/security/nss/lib/ssl/Makefile	12 Nov 2012 21:34:20 -0000
>@@ -55,9 +55,42 @@ include $(CORE_DEPTH)/coreconf/rules.mk
> # (7) Execute "local" rules. (OPTIONAL).                              #
> #######################################################################
> 
>+# By setting the USE_SYSTEM_NSSUTIL, USE_SYSTEM_FREEBL, and USE_SYSTEM_SOFTOKEN
>+# buiild tomew environment variables a downstream maintainer can opt to skip
>+# building util, freebl, and softoken.
>+#
>+# util may be installed in the system, as part of nss-util-devel
>+# as is the case with fedora and derived distributions
>+ifeq ($(OS_ARCH),Linux)
>+ifndef USE_SYSTEM_NSSUTIL
>+UTIL_SRCDIR = util  # Add the util directory to DIRS.
>+endif
>+endif
>+
>+# freebl may be installed in the system, perhaps as part of
>+# nss-softokn-freebl-devel as is the case with fedora.
>+# in fedora and hel
>+ifeq ($(OS_ARCH),Linux)
>+ifndef USE_SYSTEM_FREEBL
>+FREEBL_SRCDIR = freebl  # Add the freebl directory to DIRS.
>+endif
>+endif
>+
>+# softoken may be installed in the system, as part of nss-softokn-devel
>+# as is the case in fedora and derived distributions
>+ifeq ($(OS_ARCH),Linux)
>+ifndef USE_SYSTEM_SOFTOKEN
>+SOFTOKEN_SRCDIR = softoken  # Add the softoken directory to DIRS.
>+endif
>+endif
>+
> export:: private_export
> 
> ifndef NSS_NO_PKCS11_BYPASS
> # indicates dependency on freebl static lib
>+# unless we are using the system installed one which occurs
>+# when building nss without softoken/freebl in the source tree
>+ifndef USE_SYSTEM_FREEBL
> $(SHARED_LIBRARY): $(CRYPTOLIB)
> endif
>+endif
>Index: ./mozilla/security/nss/lib/ssl/config.mk
>===================================================================
>RCS file: /cvsroot/mozilla/security/nss/lib/ssl/config.mk,v
>retrieving revision 1.33
>diff -u -p -r1.33 config.mk
>--- ./mozilla/security/nss/lib/ssl/config.mk	11 Jun 2012 02:38:30 -0000	1.33
>+++ ./mozilla/security/nss/lib/ssl/config.mk	12 Nov 2012 21:34:20 -0000
>@@ -90,3 +90,24 @@ EXTRA_LIBS += $(ZLIB_LIBS)
> endif
> 
> endif
>+
>+# If a platform has a system nss-util, set USE_SYSTEM_NSSUTIL to 1 and
>+# NSSUTIL_LIBS to the linker command-line arguments for the system nssutil
>+# (for example, -lnssutil3 on fedora) in the platform's config file in coreconf.
>+ifdef USE_SYSTEM_NSSUTIL
>+DEFINES += -DNSS_USE_SYSTEM_NSSUTIL
>+OS_LIBS += $(NSSUTIL_LIBS)
>+else
>+NSSUTIL_LIBS = $(DIST)/lib/$(LIB_PREFIX)nssutil3.$(LIB_SUFFIX)
>+EXTRA_LIBS += $(NSSUTIL_LIBS)
>+endif
>+# 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 nssutil
>+# (for example, -lfreebl3 on fedora) in the platform's config file in coreconf.
>+ifdef USE_SYSTEM_FREEBL
>+DEFINES += -DNSS_USE_SYSTEM_FREEBL
>+EXTRA_LIBS += $(FREEBL_LIBS)
>+else
>+FREEBL_LIBS = $(DIST)/lib/$(LIB_PREFIX)freebl3.$(LIB_SUFFIX)
>+EXTRA_LIBS += $(FREEBL_LIBS)
>+endif
>Index: ./mozilla/security/nss/tests/cipher/cipher.sh
>===================================================================
>RCS file: /cvsroot/mozilla/security/nss/tests/cipher/cipher.sh,v
>retrieving revision 1.18
>diff -u -p -r1.18 cipher.sh
>--- ./mozilla/security/nss/tests/cipher/cipher.sh	20 Mar 2012 14:47:29 -0000	1.18
>+++ ./mozilla/security/nss/tests/cipher/cipher.sh	12 Nov 2012 21:34:20 -0000
>@@ -101,6 +101,17 @@ cipher_cleanup()
> 
> ################## main #################################################
> 
>+# When building nss without softoken bltest is likely not built
>+# as it has already been built and the cipher suite run as part
>+# a separate nss softoken build. Such is the case with fedora
>+# and some of its derived distributions.
>+if [ ! -f ${DIST}/${OBJDIR}/bin/bltest -o  \
>+     ! -f ${DIST}/${OBJDIR}/bin/bltest.exe ]; then
>+    echo "bltest not built, skipping this test." >> ${LOGFILE}
>+    res = 0
>+    html_msg $res $EXP_RET "$TESTNAME"
>+    return 0
>+fi
> cipher_init
> cipher_main
> cipher_cleanup

Flags:

rrelyea: review-

Actions: View | Diff

Attachments on bug 689918: 552424 | 552425 | 552428 | 552434 | 552436 | 552443 | 561692 | 561694 | 561696 | 561697 | 561698 | 561699 | 561700 | 572565 | 574101 | 584429 | 643175 | 643180 | 643202 | 643203 | 643660 | 643794 | 643807 | 669709 | 669710 | 669711 | 669712 | 669713 | 762643 | 762645 | 762646