Rebased ref, commits from common ancestor:
commit d1d937200abda8699e4edd2b662dbdc735d4cc1e
Author: Andras Timar <[email protected]>
AuthorDate: Fri Oct 22 22:30:01 2021 +0200
Commit: Andras Timar <[email protected]>
CommitDate: Sat Oct 23 16:15:29 2021 +0200
attempted fix of Win32 MSP creation
Change-Id: Id7743b45958a53fa5e3034836ba280dfddcc2e2e
diff --git a/configure.ac b/configure.ac
index ed5f5a3c2ad5..491c9338a31c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3660,7 +3660,7 @@ cygwin*|wsl*)
esac
SCPDEFS="$SCPDEFS -D_MSC_VER"
- AC_SUBST(WIN_BUILD_ARCH)
+ AC_SUBST(WIN_HOST_ARCH)
;;
esac
diff --git a/setup_native/source/packinfo/finals_instsetoo.txt.in
b/setup_native/source/packinfo/finals_instsetoo.txt.in
index 104fc9564e6c..993b41dacc63 100644
--- a/setup_native/source/packinfo/finals_instsetoo.txt.in
+++ b/setup_native/source/packinfo/finals_instsetoo.txt.in
@@ -30,4 +30,4 @@
# OpenOffice pro de
\\<server>\<path>\msi\OOO300_m6_native_packed-1_de.9352\openofficeorg30.msi
# OpenOfficeLanguagePack pro es
\\<server>\<path>\msi\OOO300_m6_native_packed-1_es.9352\openofficeorg30.msi
# URE pro en-US
\\<server>\<path>\msi\OOO300_m6_native_packed-1_en-US.9352\ure14.msi
-CollaboraOffice pro
en-US,ar,as,ast,bg,bn-IN,br,ca,ca-valencia,cy,cs,da,de,el,en-GB,es,et,eu,fi,fr,ga,gd,gl,gu,he,hi,hr,hu,id,is,it,ja,km,kn,ko,lt,lv,ml,mr,nb,nl,nn,oc,or,pa-IN,pl,pt,pt-BR,ro,ru,sk,sl,sr,sr-Latn,sv,ta,te,tr,uk,vi,zh-CN,zh-TW
c:\lo\src\co-21.06.3-@WIN_BUILD_ARCH@\Collabora_Office_21.06.3.1_Win_@[email protected]
+CollaboraOffice pro
en-US,ar,as,ast,bg,bn-IN,br,ca,ca-valencia,cy,cs,da,de,el,en-GB,es,et,eu,fi,fr,ga,gd,gl,gu,he,hi,hr,hu,id,is,it,ja,km,kn,ko,lt,lv,ml,mr,nb,nl,nn,oc,or,pa-IN,pl,pt,pt-BR,ro,ru,sk,sl,sr,sr-Latn,sv,ta,te,tr,uk,vi,zh-CN,zh-TW
c:\lo\src\co-21.06.3-@WIN_HOST_ARCH@\Collabora_Office_21.06.3.1_Win_@[email protected]
diff --git a/solenv/bin/modules/installer/windows/admin.pm
b/solenv/bin/modules/installer/windows/admin.pm
index 3dfba9e7a8de..c0c98f9e5ab5 100644
--- a/solenv/bin/modules/installer/windows/admin.pm
+++ b/solenv/bin/modules/installer/windows/admin.pm
@@ -291,6 +291,8 @@ sub create_directory_structure
$fullpathhash{"SystemFolder_x86_VC.194841A2_D0F2_3B96_9F71_05BA91BEA0FA"}
= $targetdir . $installer::globals::separator . "System";
$fullpathhash{"SystemFolder_x86_VC.E281B893_10D7_34CE_BB0E_B69D88E154A5"}
= $targetdir . $installer::globals::separator . "System";
$fullpathhash{"System64Folder_amd64_VC.AF4EABEE_4589_3789_BA0A_C83A71662E1D"} =
$targetdir . $installer::globals::separator . "System64";
+ # FIXME DefaultDir in MSI was '.', why is this a problem now?
+ $fullpathhash{"Colla_progr_shlxt_a8b47146a"} = $targetdir .
$installer::globals::separator . "program" . $installer::globals::separator .
"shlxthdl";
return \%fullpathhash;
}
commit 31a296c607fedf62870138af50cf4c63e6134e93
Author: Luboš Luňák <[email protected]>
AuthorDate: Tue Oct 12 23:22:31 2021 +0200
Commit: Luboš Luňák <[email protected]>
CommitDate: Sat Oct 23 08:05:15 2021 +0200
MSVC LTO does not like mixing 32bit and 64 code
So disable LTO for x64 code when building for 32bit.
Change-Id: I8445d8307b3b797b78cea12e6322e0d792c71dfd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123537
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <[email protected]>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124081
Tested-by: Jenkins CollaboraOffice <[email protected]>
diff --git a/solenv/gbuild/platform/com_MSC_class.mk
b/solenv/gbuild/platform/com_MSC_class.mk
index 505191069005..aa30d13951fd 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -59,7 +59,7 @@ $(call gb_Helper_abbreviate_dirs,\
unset INCLUDE && \
$(call gb_CObject__compiler,$(2),$(3),$(7)) \
$(DEFS) \
- $(gb_LTOFLAGS) \
+ $(if $(filter YES,$(LIBRARY_X64)), ,$(gb_LTOFLAGS)) \
$(call gb_Helper_remove_overridden_flags, \
$(2) $(if
$(WARNINGS_DISABLED),$(gb_CXXFLAGS_DISABLE_WARNINGS))) \
$(if $(EXTERNAL_CODE), \
@@ -103,7 +103,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(4) $(5) $(if
$(WARNINGS_DISABLED),$(gb_CXXFLAGS_DISABLE_WARNINGS))) \
-Fd$(PDBFILE) \
$(if $(EXTERNAL_CODE),$(if
$(COM_IS_CLANG),-Wno-undef),$(gb_DEFS_INTERNAL)) \
- $(gb_LTOFLAGS) \
+ $(if $(filter YES,$(LIBRARY_X64)), ,$(gb_LTOFLAGS)) \
$(gb_COMPILERDEPFLAGS) \
$(6) \
-c $(3) \
