Attachment 669709 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), 7.20 KB, created by Elio Maldonado Batiz on 2012-12-27 22:42:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Elio Maldonado Batiz

Created: 2012-12-27 22:42:45 UTC

Size: 7.20 KB

patch

obsolete

>diff -up ./mozilla/security/nss/cmd/shlibsign/Makefile.689918 ./mozilla/security/nss/cmd/shlibsign/Makefile
>--- ./mozilla/security/nss/cmd/shlibsign/Makefile.689918	2012-03-20 07:47:18.000000000 -0700
>+++ ./mozilla/security/nss/cmd/shlibsign/Makefile	2012-12-27 09:43:46.962222071 -0800
>@@ -45,7 +45,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 +60,7 @@ CHECKLOC = $(CHECKLIBS:.$(DLL_SUFFIX)=.c
> 
> MD_LIB_RELEASE_FILES = $(CHECKLOC)
> ALL_TRASH += $(CHECKLOC)
>-
>+endif
> 
> #######################################################################
> # (5) Execute "global" rules. (OPTIONAL)                              #
>diff -up ./mozilla/security/nss/lib/Makefile.689918 ./mozilla/security/nss/lib/Makefile
>--- ./mozilla/security/nss/lib/Makefile.689918	2012-04-25 07:49:24.000000000 -0700
>+++ ./mozilla/security/nss/lib/Makefile	2012-12-27 09:43:46.977222063 -0800
>@@ -58,3 +58,35 @@ include $(CORE_DEPTH)/coreconf/rules.mk
> # (7) Execute "local" rules. (OPTIONAL).                              #
> #######################################################################
> 
>+UTIL_SRCDIR=
>+FREEBL_SRCDIR=
>+SOFTOKEN_SRCDIR=
>+
>+# 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
>diff -up ./mozilla/security/nss/lib/manifest.mn.689918 ./mozilla/security/nss/lib/manifest.mn
>--- ./mozilla/security/nss/lib/manifest.mn.689918	2012-04-25 07:49:24.000000000 -0700
>+++ ./mozilla/security/nss/lib/manifest.mn	2012-12-27 09:43:46.983222059 -0800
>@@ -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 \
>diff -up ./mozilla/security/nss/lib/ssl/config.mk.689918 ./mozilla/security/nss/lib/ssl/config.mk
>--- ./mozilla/security/nss/lib/ssl/config.mk.689918	2012-06-10 19:38:30.000000000 -0700
>+++ ./mozilla/security/nss/lib/ssl/config.mk	2012-12-27 09:43:46.984222059 -0800
>@@ -90,3 +90,25 @@ 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
>+
>diff -up ./mozilla/security/nss/lib/ssl/Makefile.689918 ./mozilla/security/nss/lib/ssl/Makefile
>--- ./mozilla/security/nss/lib/ssl/Makefile.689918	2012-06-10 19:38:30.000000000 -0700
>+++ ./mozilla/security/nss/lib/ssl/Makefile	2012-12-27 09:43:46.985222058 -0800
>@@ -58,6 +58,10 @@ include $(CORE_DEPTH)/coreconf/rules.mk
> export:: private_export
> 
> ifndef NSS_NO_PKCS11_BYPASS
>-# indicates dependency on freebl static lib
>+# indicates dependency on freebl static lib, except when using
>+# the system installed one as occurs when building nss without
>+# softoken/freebl in the source tree 
>+ifndef USE_SYSTEM_FREEBL
> $(SHARED_LIBRARY): $(CRYPTOLIB)
> endif
>+endif
>diff -up ./mozilla/security/nss/Makefile.689918 ./mozilla/security/nss/Makefile
>--- ./mozilla/security/nss/Makefile.689918	2012-11-13 17:14:07.000000000 -0800
>+++ ./mozilla/security/nss/Makefile	2012-12-27 09:43:46.987222057 -0800
>@@ -147,6 +147,18 @@ endif
> 
> nss_RelEng_bld: build_coreconf import build_dbm all
> 
>+# Copy softoken/freebl/nssdbm from the system if we didn't build them
>+copy_softoken_libs::
>+ifeq ($(OS_ARCH),Linux)
>+ifeq ($NSS_BUILD_WITHOUT_SOFTOKEN),1)
>+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
>+endif
>+
> package:
> 	$(MAKE) -C pkg publish
> 
>diff -up ./mozilla/security/nss/tests/cipher/cipher.sh.689918 ./mozilla/security/nss/tests/cipher/cipher.sh
>--- ./mozilla/security/nss/tests/cipher/cipher.sh.689918	2012-03-20 07:47:29.000000000 -0700
>+++ ./mozilla/security/nss/tests/cipher/cipher.sh	2012-12-27 09:43:46.988222057 -0800
>@@ -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{PROG_SUFFIX} ]; 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
>diff -up ./mozilla/security/nss/tests/fips/fips.sh.689918 ./mozilla/security/nss/tests/fips/fips.sh
>--- ./mozilla/security/nss/tests/fips/fips.sh.689918	2012-03-20 07:47:32.000000000 -0700
>+++ ./mozilla/security/nss/tests/fips/fips.sh	2012-12-27 09:43:46.989222056 -0800
>@@ -231,6 +231,9 @@ fips_140()
>   echo "$SCRIPTNAME: Detect mangled softoken--------------------------"
>   SOFTOKEN=${MANGLEDIR}/${DLL_PREFIX}softokn3.${DLL_SUFFIX}
> 
>+  if [ ! -f ${SOFTOKEN} ]; then
>+    html_msg ${RESULT} 0 "Skipped the manging test, ${SOFTOKEN} not found" "."
>+  else
>   echo "mangling ${SOFTOKEN}"
>   echo "mangle -i ${SOFTOKEN} -o -8 -b 5"
>   ${BINDIR}/mangle -i ${SOFTOKEN} -o -8 -b 5 2>&1
>@@ -266,6 +269,7 @@ fips_140()
>   else
>     html_failed "Mangle ${DLL_PREFIX}softokn3.${DLL_SUFFIX}"
>   fi
>+  fi
> }
> 
> ############################## fips_cleanup ############################

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