You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ji...@apache.org on 2026/10/12 20:17:15 UTC

(openoffice) branch AOO50X updated: macOS: skip the Mach-O load-command check for the language-pack app

This is an automated email from the ASF dual-hosted git repository.

jimjag pushed a commit to branch AOO50X
in repository https://gitbox.apache.org/repos/asf/openoffice.git


The following commit(s) were added to refs/heads/AOO50X by this push:
     new 506689575e macOS: skip the Mach-O load-command check for the language-pack app
506689575e is described below

commit 506689575eef8676a0672241dd1b7a194a714deb
Author: Jim Jagielski <ji...@gmail.com>
AuthorDate: Mon Oct 12 16:16:42 2026 -0400

    macOS: skip the Mach-O load-command check for the language-pack app
    
    Its bundle holds only scripts and a plist, so the check always failed with
    "no Mach-O files found".
    
    (cherry picked from commit be094486c5534336663aa1ddadd1cdda20a9ddd0)
---
 main/solenv/bin/modules/installer/simplepackage.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/main/solenv/bin/modules/installer/simplepackage.pm b/main/solenv/bin/modules/installer/simplepackage.pm
index 4f118d322b..2cf81b6404 100644
--- a/main/solenv/bin/modules/installer/simplepackage.pm
+++ b/main/solenv/bin/modules/installer/simplepackage.pm
@@ -552,7 +552,8 @@ sub create_package
 		}
 
 		# A build-time load path left in a shipped Mach-O breaks at runtime, signed or not.
-		foreach my $appdir ( glob("$localtempdir/$folder/*.app") )
+		# The language-pack app is only scripts and a plist, so it has no Mach-O to check.
+		foreach my $appdir ( $installer::globals::languagepack ? () : glob("$localtempdir/$folder/*.app") )
 		{
 			my $checkreturn = system($ENV{'SOLARENV'} . "/bin/macosx-check-load-commands.sh", $appdir);
 			if ( $checkreturn ) { installer::exiter::exit_program("ERROR: Unrelocated Mach-O load commands in $appdir!", "create_package"); }