From ecee53f9ba02a3821077d1bc1016c0aa0d4e9180 Mon Sep 17 00:00:00 2001 From: Rmys Date: Sun, 5 Jan 2025 11:52:00 +0300 Subject: [PATCH] thunderbird --- network/mail/thunderbird/actions.py | 7 ------- network/mail/thunderbird/files/rust-lto-thin.patch | 12 ++++++++++++ network/mail/thunderbird/pspec.xml | 3 ++- 3 files changed, 14 insertions(+), 8 deletions(-) create mode 100644 network/mail/thunderbird/files/rust-lto-thin.patch diff --git a/network/mail/thunderbird/actions.py b/network/mail/thunderbird/actions.py index 916e0c1999..9ffe82cea3 100644 --- a/network/mail/thunderbird/actions.py +++ b/network/mail/thunderbird/actions.py @@ -14,7 +14,6 @@ from pisi.actionsapi import shelltools MOZAPPDIR= "/usr/lib/thunderbird" shelltools.export("SHELL", "/bin/sh") shelltools.export("PYTHON", "/usr/bin/python3") -# shelltools.export("MACH_USE_SYSTEM_PYTHON", "1") shelltools.system("export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=none") shelltools.export("MOZBUILD_STATE_PATH", "mozbuild") @@ -37,21 +36,15 @@ def setup(): #shelltools.makedirs("langpack-tb/langpack-%s@thunderbird.mozilla.org" % locale) #shelltools.system("unzip -uo %s/%s.xpi -d langpack-tb/langpack-%s@thunderbird.mozilla.org" % (xpidir, locale, locale)) - # shelltools.makedirs(ObjDir) - # shelltools.cd(ObjDir) shelltools.system("./mach configure") def build(): - # shelltools.cd(ObjDir) shelltools.system("./mach build") shelltools.system("./mach buildsymbols") def install(): - # shelltools.cd(ObjDir) shelltools.system("DESTDIR=%s ./mach install " % get.installDIR()) - # shelltools.cd("..") - # Install fix language packs pisitools.insinto("/usr/lib/thunderbird/extensions", "./langpack-tb/*") diff --git a/network/mail/thunderbird/files/rust-lto-thin.patch b/network/mail/thunderbird/files/rust-lto-thin.patch new file mode 100644 index 0000000000..788fceab39 --- /dev/null +++ b/network/mail/thunderbird/files/rust-lto-thin.patch @@ -0,0 +1,12 @@ +set rust crate lto to thin to not use fatlto for gkrust which fails sometimes +--- a/config/makefiles/rust.mk ++++ b/config/makefiles/rust.mk +@@ -92,7 +92,7 @@ + # Never enable when coverage is enabled to work around https://github.com/rust-lang/rust/issues/90045. + ifndef MOZ_CODE_COVERAGE + ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE))) +-cargo_rustc_flags += -Clto$(if $(filter full,$(MOZ_LTO_RUST_CROSS)),=fat) ++cargo_rustc_flags += -Clto=thin + endif + # We need -Cembed-bitcode=yes for all crates when using -Clto. + RUSTFLAGS += -Cembed-bitcode=yes diff --git a/network/mail/thunderbird/pspec.xml b/network/mail/thunderbird/pspec.xml index 924fbe9e1c..ccf5980b80 100644 --- a/network/mail/thunderbird/pspec.xml +++ b/network/mail/thunderbird/pspec.xml @@ -59,6 +59,7 @@ metainfo.patch D231480.patch + rust-lto-thin.patch @@ -475,7 +476,7 @@ 2025-01-04 128.5.2 - Version bump + Version bump. Pisi Linux Community admin@pisilinux.org