external/firebird/ExternalPackage_firebird.mk | 8 ++++++++
1 file changed, 8 insertions(+)
New commits:
commit dfa78d2eac7632c93d1e76e52c9d46050dd932a2
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Mon Jul 29 17:03:50 2024 +0200
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Mon Jul 29 19:11:15 2024 +0200
fix macOS codesigning: only mach-o files allowed in Contents/Framework
put the other files in Contents/Resources and have them signed with the
overall bundle-signature.
Putting them into Contents/Framework or Contents/MacOS would require the
use of extended attributes and is not recommended, see also
4b9190fc29aec0f005f08c0269bb9ff081f19fe3 /
https://gerrit.libreoffice.org/c/core/+/109537
Change-Id: I582e3198b1a006e76d6ad37bd945e0712d17c669
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171217
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
diff --git a/external/firebird/ExternalPackage_firebird.mk
b/external/firebird/ExternalPackage_firebird.mk
index 55e79406d0e7..2a865a2e57ab 100644
--- a/external/firebird/ExternalPackage_firebird.mk
+++ b/external/firebird/ExternalPackage_firebird.mk
@@ -25,7 +25,15 @@ $(eval $(call
gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/libEngine1
$(eval $(call
gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/intl/libfbintl.so,gen/$(if
$(ENABLE_DEBUG),Debug,Release)/firebird/intl/libfbintl.so))
endif
+ifeq ($(OS),MACOSX)
+# only mach-o binaries allowed in bin folder (signing scripts would require
extended attributes)
+# so install it into Resources folder and use a symlink instead
+# see https://developer.apple.com/library/archive/technotes/tn2206/_index.html
+$(eval $(call
gb_ExternalPackage_add_file,firebird,$(LIBO_SHARE_FOLDER)/firebird/fbintl.conf,gen/$(if
$(ENABLE_DEBUG),Debug,Release)/firebird/intl/fbintl.conf))
+$(eval $(call
gb_ExternalPackage_add_symbolic_link,firebird,$(LIBO_LIB_FOLDER)/intl/fbintl.conf,../../$(LIBO_SHARE_FOLDER)/firebird/fbintl.conf))
+else
$(eval $(call
gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/intl/fbintl.conf,gen/$(if
$(ENABLE_DEBUG),Debug,Release)/firebird/intl/fbintl.conf))
+endif
$(eval $(call
gb_ExternalPackage_add_file,firebird,$(LIBO_SHARE_FOLDER)/firebird/firebird.msg,gen/$(if
$(ENABLE_DEBUG),Debug,Release)/firebird/firebird.msg))
$(eval $(call
gb_ExternalPackage_add_file,firebird,$(LIBO_SHARE_FOLDER)/firebird/security3.fdb,gen/$(if
$(ENABLE_DEBUG),Debug,Release)/firebird/security3.fdb))
