From 527c1053c4751d7b860b22027ec466292e974655 Mon Sep 17 00:00:00 2001 From: asac Date: Tue, 13 Mar 2007 20:10:10 +0100 Subject: [PATCH] ubuntu-no-nss-chk-create --- security/manager/Makefile.in | 49 ----------------------------------- security/nss/cmd/shlibsign/Makefile | 2 +- 2 files changed, 1 insertions(+), 50 deletions(-) diff --git a/security/manager/Makefile.in b/security/manager/Makefile.in index ad2db7a..7cb3a30 100644 --- a/security/manager/Makefile.in +++ b/security/manager/Makefile.in @@ -53,7 +53,6 @@ PACKAGE_VARS += \ SMIME3_LIB \ SSL3_LIB \ SOFTOKEN3_LIB \ - SOFTOKEN3_CHK \ LOADABLE_ROOT_MODULE \ HAVE_FREEBL_LIBS \ HAVE_FREEBL_LIBS_32 \ @@ -68,7 +67,6 @@ NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX) SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX) SSL3_LIB = $(DLL_PREFIX)ssl3$(DLL_SUFFIX) SOFTOKEN3_LIB = $(DLL_PREFIX)softokn3$(DLL_SUFFIX) -SOFTOKEN3_CHK = $(DLL_PREFIX)softokn3.chk # Default HAVE_FREEBL_LIBS = 1 @@ -99,23 +97,17 @@ endif ifdef HAVE_FREEBL_LIBS FREEBL_LIB = $(DLL_PREFIX)freebl3$(DLL_SUFFIX) -FREEBL_CHK = $(DLL_PREFIX)freebl3.chk endif ifdef HAVE_FREEBL_LIBS_32 FREEBL_32INT_LIB = libfreebl_32int_3$(DLL_SUFFIX) -FREEBL_32INT_CHK = libfreebl_32int_3.chk FREEBL_32FPU_LIB = libfreebl_32fpu_3$(DLL_SUFFIX) -FREEBL_32FPU_CHK = libfreebl_32fpu_3.chk endif ifdef HAVE_FREEBL_LIBS_32INT64 FREEBL_32INT64_LIB = libfreebl_32int64_3$(DLL_SUFFIX) -FREEBL_32INT64_CHK = libfreebl_32int64_3.chk endif ifdef HAVE_FREEBL_LIBS_64 FREEBL_64INT_LIB = libfreebl_64int_3$(DLL_SUFFIX) -FREEBL_64INT_CHK = libfreebl_64int_3.chk FREEBL_64FPU_LIB = libfreebl_64fpu_3$(DLL_SUFFIX) -FREEBL_64FPU_CHK = libfreebl_64fpu_3.chk endif ABS_DIST := $(shell cd $(DIST) && pwd) @@ -206,7 +198,6 @@ DEFAULT_GMAKE_FLAGS += \ OS_ARCH="$(OS_ARCH)" \ CPU_ARCH="$(TARGET_CPU)" \ $(NULL) -SKIP_CHK=1 endif SUBMAKEFILES = boot/Makefile ssl/Makefile pki/Makefile locales/Makefile @@ -219,10 +210,8 @@ export:: .nss.cleaned ifndef MOZ_NATIVE_NSS $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean -ifndef SKIP_CHK $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean -endif touch $@ endif @@ -252,43 +241,24 @@ else endif ifndef MOZ_NATIVE_NSS $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) -ifndef SKIP_CHK $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) -endif $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin -ifndef SKIP_CHK - $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DIST)/bin -endif $(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin $(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin $(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DIST)/bin $(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DIST)/bin ifdef HAVE_FREEBL_LIBS -ifndef SKIP_CHK - $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DIST)/bin -endif $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DIST)/bin endif ifdef HAVE_FREEBL_LIBS_32 -ifndef SKIP_CHK - $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DIST)/bin - $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(DIST)/bin -endif $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DIST)/bin $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DIST)/bin endif ifdef HAVE_FREEBL_LIBS_32INT64 -ifndef SKIP_CHK - $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(DIST)/bin -endif $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DIST)/bin endif ifdef HAVE_FREEBL_LIBS_64 -ifndef SKIP_CHK - $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(DIST)/bin - $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(DIST)/bin -endif $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DIST)/bin $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DIST)/bin endif @@ -303,38 +273,21 @@ endif install:: ifndef MOZ_NATIVE_NSS $(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir) -ifndef SKIP_CHK - $(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir) -endif $(SYSINSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DESTDIR)$(mozappdir) $(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir) $(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir) $(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir) ifdef HAVE_FREEBL_LIBS -ifndef SKIP_CHK - $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DESTDIR)$(mozappdir) -endif $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DESTDIR)$(mozappdir) endif ifdef HAVE_FREEBL_LIBS_32 -ifndef SKIP_CHK - $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DESTDIR)$(mozappdir) - $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(DESTDIR)$(mozappdir) -endif $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DESTDIR)$(mozappdir) $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DESTDIR)$(mozappdir) endif ifdef HAVE_FREEBL_LIBS_32INT64 -ifndef SKIP_CHK - $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(DESTDIR)$(mozappdir) -endif $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DESTDIR)$(mozappdir) endif ifdef HAVE_FREEBL_LIBS_64 -ifndef SKIP_CHK - $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(DESTDIR)$(mozappdir) - $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(DESTDIR)$(mozappdir) -endif $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DESTDIR)$(mozappdir) $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DESTDIR)$(mozappdir) endif @@ -356,11 +309,9 @@ endif ifndef MOZ_NATIVE_NSS $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean -ifndef SKIP_CHK $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean endif -endif echo-requires-recursive:: $(MAKE) -C boot $@ diff --git a/security/nss/cmd/shlibsign/Makefile b/security/nss/cmd/shlibsign/Makefile index 6c6ad27..c061d5c 100644 --- a/security/nss/cmd/shlibsign/Makefile +++ b/security/nss/cmd/shlibsign/Makefile @@ -99,5 +99,5 @@ else $(call core_abspath,$(NSPR_LIB_DIR)) $(call core_abspath,$<) endif -libs install :: $(CHECKLOC) +libs install :: -- 1.4.4.4