From a290e09afff62e0e5517b4ea25f29d20d7b86753 Mon Sep 17 00:00:00 2001 From: Siddharth Agarwal Date: Thu, 30 Aug 2012 01:18:53 +0530 Subject: [PATCH 1/2] Bug 786791 - MSYS mangles the signtool shlibsign cmd with Pymake because it begins with a space. pending-r=ted --- toolkit/mozapps/installer/packager.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk index 3581c64561d..bf8e06e2beb 100644 --- a/toolkit/mozapps/installer/packager.mk +++ b/toolkit/mozapps/installer/packager.mk @@ -620,7 +620,7 @@ ifeq ($(OS_ARCH),OS2) NSS_DLL_SUFFIX = .DLL SIGN_CMD = $(MOZILLA_DIR)/toolkit/mozapps/installer/os2/sign.cmd $(DIST) else -SIGN_CMD = $(RUN_TEST_PROGRAM) $(_ABS_DIST)/bin/shlibsign$(BIN_SUFFIX) -v -i +SIGN_CMD = $(strip $(RUN_TEST_PROGRAM) $(_ABS_DIST)/bin/shlibsign$(BIN_SUFFIX) -v -i) endif endif From 08aa74dfc05d099fd76269f8f1c77ac1a93de9d4 Mon Sep 17 00:00:00 2001 From: Siddharth Agarwal Date: Thu, 30 Aug 2012 05:47:07 +0530 Subject: [PATCH 2/2] Bug 786886 - Force Pymake to spin up a shell for the signing command. r=gps --- toolkit/mozapps/installer/packager.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk index bf8e06e2beb..bbf53e3a50c 100644 --- a/toolkit/mozapps/installer/packager.mk +++ b/toolkit/mozapps/installer/packager.mk @@ -748,7 +748,8 @@ endif @cp -av $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/. $(DEPTH)/installer-stage/core @(cd $(DEPTH)/installer-stage/core && $(CREATE_PRECOMPLETE_CMD)) ifdef MOZ_SIGN_PREPARED_PACKAGE_CMD - $(MOZ_SIGN_PREPARED_PACKAGE_CMD) $(DEPTH)/installer-stage +# The && true is necessary to make sure Pymake spins a shell + $(MOZ_SIGN_PREPARED_PACKAGE_CMD) $(DEPTH)/installer-stage && true endif elfhack: