solenv/gbuild/platform/macosx.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 6a5a460e8a9592ca089ce15b0d2fd641db0c189a
Author: Tor Lillqvist <t...@iki.fi>
Date: Thu Aug 22 12:54:01 2013 +0300
Use codesign --force to replace a (bogus?) previous signature
For some reason I get an error message about soffice.bin already being
signed, even though it isn't. Also ignore (bogus?) exit status from
codesign.
Change-Id: I0227cf9a3b098a5c16ea68643c84cdc0ded2a8f9
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 6035c67..1423d11 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -154,7 +154,7 @@ $(call gb_Helper_abbreviate_dirs,\
ln -sf $(notdir $(1)) $(basename $(1)).jnilib &&) \
$(if $(MACOSX_CODESIGNING_IDENTITY), \
$(if $(filter Executable,$(TARGETTYPE)), \
- codesign
--identifier=$(MACOSX_BUNDLE_IDENTIFIER).$(notdir $(1)) --sign
$(MACOSX_CODESIGNING_IDENTITY) $(1) &&)) \
+ (codesign
--identifier=$(MACOSX_BUNDLE_IDENTIFIER).$(notdir $(1)) --sign
$(MACOSX_CODESIGNING_IDENTITY) --force $(1) || true) &&)) \
$(if $(filter Library,$(TARGETTYPE)),\
otool -l $(1) | grep -A 5 LC_ID_DYLIB > $(1).exports.tmp && \
$(NM) -g -P $(1) | cut -d' ' -f1-2 | grep -v U$$ \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
