diff --git a/extra/libreoffice-fresh/PKGBUILD b/extra/libreoffice-fresh/PKGBUILD index 4bcb0ffd3..6d18242cc 100644 --- a/extra/libreoffice-fresh/PKGBUILD +++ b/extra/libreoffice-fresh/PKGBUILD @@ -5,6 +5,7 @@ # - disable firebird until libfbclient is updated # - specify a US mirror # - make build-nocheck +# - remove --enable-lto buildarch=12 highmem=1 @@ -20,7 +21,7 @@ pkgbase=libreoffice-fresh pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh') _LOver=7.3.0.3 pkgver=7.3.0 -pkgrel=1 +pkgrel=2 arch=('x86_64') license=('LGPL3') url="https://www.libreoffice.org/" @@ -69,6 +70,7 @@ source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc} ${_additional_source_url2}/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf ${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll make-pyuno-work-with-system-wide-module-install.diff + fix-lto-build-without-clang.patch soffice-template.desktop.in libreoffice-fresh.sh libreoffice-fresh.csh) noextract=(35c94d2df8893241173de1d16b6034c0-swingExSrc.zip @@ -117,6 +119,7 @@ sha256sums=('98d369c9541f0c3286345b93f448f2ceb2e344865ee01bdd58f3bb27f08f3f25' 'f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140' 'eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6' 'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563' + 'bbbeec2ed1b9b3054e70c4cee9837a40fb89a11edbb73718533945f109ea683e' 'd0be8099cbee3c9dfda694a828149b881c345b204ab68826f317580aafb50879' 'cd1b25ff390e436c6bffa65c6e12382236e3ccbf8d3aae51b1b59bcaed79fd8a' 'de20f36d45f0fecc2d94176dd3ec7226ab07fa8ffb9b0bc73c200349a9273de1') @@ -140,6 +143,9 @@ prepare() { # fix not upstreamable pyuno paths - FS#54250 patch -Np1 -i "${srcdir}"/make-pyuno-work-with-system-wide-module-install.diff + # fix LTO build when clang is not present + patch -Np1 -i "${srcdir}"/fix-lto-build-without-clang.patch + #use the CFLAGS but remove the LibO overridden ones for i in $CFLAGS; do case "$i" in @@ -240,8 +246,6 @@ build() { --with-gdrive-client-secret=${_google_default_client_secret} \ --disable-dependency-tracking -# --enable-lto \ - touch src.downloaded make build-nocheck diff --git a/extra/libreoffice-fresh/fix-lto-build-without-clang.patch b/extra/libreoffice-fresh/fix-lto-build-without-clang.patch new file mode 100644 index 000000000..ae95777aa --- /dev/null +++ b/extra/libreoffice-fresh/fix-lto-build-without-clang.patch @@ -0,0 +1,11 @@ +--- libreoffice-7.3.0.3.orig/solenv/gbuild/platform/com_GCC_defs.mk 2022-02-02 23:12:39.000000000 +0000 ++++ libreoffice-7.3.0.3/solenv/gbuild/platform/com_GCC_defs.mk 2022-02-02 23:27:44.167129779 +0000 +@@ -196,7 +196,7 @@ else + # use first element of the PARALLELISM, to allow values like "12 -l 14" to specify load limits + gb_LTOFLAGS := -flto=$(if $(filter-out 0,$(PARALLELISM)),$(firstword $(PARALLELISM)),auto) -fuse-linker-plugin -O2 + # clang does not support -flto= +-gb_CLANG_LTOFLAGS := -flto=thin ++gb_CLANG_LTOFLAGS := -flto + endif + endif +