|
1 # HG changeset patch |
|
2 # User Takanori MATSUURA <t.matsuu@gmail.com> |
|
3 # Date 1323798527 -32400 |
|
4 # Node ID f98be8c8e4e799e7ba8ddc367122edeccaaaca43 |
|
5 # Parent 4b71b1e9cc0c30b13ee67d71d4030b6754ab0e38 |
|
6 Bug 710268 - sign NSS libraries only when they exist |
|
7 |
|
8 diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk |
|
9 --- a/toolkit/mozapps/installer/packager.mk |
|
10 +++ b/toolkit/mozapps/installer/packager.mk |
|
11 @@ -566,27 +566,27 @@ NSSDBM = $(DIST)/$(STAGEPATH)$(MOZ_PKG_ |
|
12 FREEBL = $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/$(DLL_PREFIX)freebl3$(NSS_DLL_SUFFIX) |
|
13 FREEBL_32FPU = $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/$(DLL_PREFIX)freebl_32fpu_3$(DLL_SUFFIX) |
|
14 FREEBL_32INT = $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/$(DLL_PREFIX)freebl_32int_3$(DLL_SUFFIX) |
|
15 FREEBL_32INT64 = $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/$(DLL_PREFIX)freebl_32int64_3$(DLL_SUFFIX) |
|
16 FREEBL_64FPU = $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/$(DLL_PREFIX)freebl_64fpu_3$(DLL_SUFFIX) |
|
17 FREEBL_64INT = $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/$(DLL_PREFIX)freebl_64int_3$(DLL_SUFFIX) |
|
18 |
|
19 SIGN_NSS += \ |
|
20 - $(SIGN_CMD) $(SOFTOKN) && \ |
|
21 - $(SIGN_CMD) $(NSSDBM) && \ |
|
22 + if test -f $(SOFTOKN); then $(SIGN_CMD) $(SOFTOKN); fi && \ |
|
23 + if test -f $(NSSDBM); then $(SIGN_CMD) $(NSSDBM); fi && \ |
|
24 if test -f $(FREEBL); then $(SIGN_CMD) $(FREEBL); fi && \ |
|
25 if test -f $(FREEBL_32FPU); then $(SIGN_CMD) $(FREEBL_32FPU); fi && \ |
|
26 if test -f $(FREEBL_32INT); then $(SIGN_CMD) $(FREEBL_32INT); fi && \ |
|
27 if test -f $(FREEBL_32INT64); then $(SIGN_CMD) $(FREEBL_32INT64); fi && \ |
|
28 if test -f $(FREEBL_64FPU); then $(SIGN_CMD) $(FREEBL_64FPU); fi && \ |
|
29 if test -f $(FREEBL_64INT); then $(SIGN_CMD) $(FREEBL_64INT); fi; |
|
30 |
|
31 endif # MOZ_PSM |
|
32 -endif # !CROSS_COMPILE |
|
33 +endif # MOZ_CAN_RUN_PROGRAMS |
|
34 |
|
35 NO_PKG_FILES += \ |
|
36 core \ |
|
37 bsdecho \ |
|
38 js \ |
|
39 js-config \ |
|
40 jscpucfg \ |
|
41 nsinstall \ |