solenv/bin/modules/installer/simplepackage.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit bf34497e91c553d6c8d6158630c392d8d4db00f1 Author: Damjan Jovanovic <[email protected]> Date: Sat Feb 17 08:22:00 2018 +0000 If LibreOffice is installed, it's incompatible "unopkg" tool will be in $PATH, causing the build to break in main/instsetoo_native as that tool lacks our "sync" option. Refer to our own unopkg using its absolute path to avoid this problem. Patch by: me diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm index e6929192c91f..1c654005bb0f 100644 --- a/solenv/bin/modules/installer/simplepackage.pm +++ b/solenv/bin/modules/installer/simplepackage.pm @@ -123,7 +123,7 @@ sub register_extensions if ( ! -f $unopkgfile ) { installer::exiter::exit_program("ERROR: $unopkgfile not found!", "register_extensions"); } - my $systemcall = $unopkgfile . " sync --verbose" . " -env:UNO_JAVA_JFW_ENV_JREHOME=true 2\>\&1 |"; + my $systemcall = $programdir . $installer::globals::separator . $unopkgfile . " sync --verbose" . " -env:UNO_JAVA_JFW_ENV_JREHOME=true 2\>\&1 |"; $installer::logger::Info->printf("... %s ...\n", $systemcall); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
