summaryrefslogtreecommitdiff
path: root/Makefile.in
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2013-02-02 10:07:10 +0200
committerTor Lillqvist <tml@iki.fi>2013-02-02 10:07:10 +0200
commit3dfd5c926848b336be34a34fe04d8da60912998b (patch)
treed418c14cf372bcb44d430dbe7137ca36dd2df4ec /Makefile.in
parent73de30ca9ca0d3d4edd00e0e8f22451238699989 (diff)
Sign executables right after linking
Change-Id: I27c929deffeb803e103609634b501622e04da033
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in17
1 files changed, 13 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in
index f9e38dd7aca3..2b43f049db94 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -337,13 +337,21 @@ ifeq ($(DISABLE_LINKOO),TRUE)
ifneq ($(MACOSX_CODESIGNING_IDENTITY),)
#
# Sign dylibs
- find $(DEVINSTALLDIR)/opt/LibreOffice.app \( -name '*.dylib' -or -name '*.dylib.*' \) ! -type l | \
+#
+# Executables get signed right after linking, see
+# solenv/gbuild/platform/macosx.mk. But many of our dylibs are built
+# by ad-hoc or 3rd-party mechanisms, so we can't easily sign them
+# right after linking. So do it here.
+#
+# The dylibs in the Python framework are called *.so. Go figure
+#
+ find $(DEVINSTALLDIR)/opt/LibreOffice.app \( -name '*.dylib' -or -name '*.dylib.*' -or -name '*.so' \) ! -type l | \
while read dylib; do \
id=`basename "$$dylib"`; \
case $$id in \
- *.dylib) \
+ *.dylib|*.so) \
;; \
- *) \
+ *.dylib.*) \
id=`echo $$id | sed -e 's/dylib.*/dylib/'`; \
;; \
esac; \
@@ -362,7 +370,8 @@ ifneq ($(MACOSX_CODESIGNING_IDENTITY),)
done
#
# Sign the app bundle as a whole (will sign the soffice binary)
- codesign --verbose --sign $(MACOSX_CODESIGNING_IDENTITY) $(DEVINSTALLDIR)/opt/LibreOffice.app
+# Not necessary as the soffice binary will have been signed after linking.
+# codesign --verbose --sign $(MACOSX_CODESIGNING_IDENTITY) $(DEVINSTALLDIR)/opt/LibreOffice.app
#
endif
@install-gdb-printers -L