opt-level = 3 for rust packages, use mold as linker for LTO

3 files changed, 21 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0ac2771fb368..212998e96e7e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -13,6 +13,7 @@ pkgbase = anki
 	makedepends = libxcrypt-compat
 	makedepends = nodejs
 	makedepends = yarn
+	makedepends = mold
 	depends = python>=3.9
 	depends = python-beautifulsoup4
 	depends = python-waitress>=2.0.0
@@ -38,11 +39,12 @@ pkgbase = anki
 	conflicts = anki-git
 	conflicts = anki-official-binary-bundle
 	conflicts = anki-qt5
-	options = !lto
 	source = anki::git+https://github.com/ankitects/anki#tag=064ea0ee08715edae868b84e48b29bd7e15d7b49?signed
 	source = no-update.patch
+	source = optimize_more.patch
 	validpgpkeys = 814EA4E90C34AF39A712DE703F5566A2D16899FB
 	sha256sums = SKIP
 	sha256sums = f934553a5ce9e046a0b8253e10da16e661b27375e2b54d6bb915267f32aff807
+	sha256sums = 213a7c6ab75dc332e79f089364f10bc7fe0c0bb6860a549a42b7e3d75970bc7d
 
 pkgname = anki
diff --git a/PKGBUILD b/PKGBUILD
index 66c55ae63345..20d80601db98 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,7 +15,6 @@ url="https://apps.ankiweb.net/"
 license=('AGPL3')
 arch=('x86_64')
 conflicts=('anki-bin' 'anki-git' 'anki-official-binary-bundle' 'anki-qt5')
-options=('!lto')
 depends=(
     # anki & aqt
     'python>=3.9'
@@ -49,6 +48,7 @@ makedepends=(
     'libxcrypt-compat'
     'nodejs'
     'yarn'
+    'mold'
 )
 optdepends=(
     'lame: record sound'
@@ -60,9 +60,11 @@ optdepends=(
 # the '.git' folder is not included in those but is required for a sucessful build
 source=("$pkgname::git+https://github.com/ankitects/anki#tag=${_tag}?signed"
 "no-update.patch"
+"optimize_more.patch"
 )
 sha256sums=('SKIP'
 'f934553a5ce9e046a0b8253e10da16e661b27375e2b54d6bb915267f32aff807'
+'213a7c6ab75dc332e79f089364f10bc7fe0c0bb6860a549a42b7e3d75970bc7d'
 )
 
 validpgpkeys=(
@@ -73,7 +75,9 @@ prepare(){
     cd "$pkgname"
     # pro-actively prevent "module not found" error (TODO: verify whether still required)
     [ -d ts/node_modules ] && rm -r ts/node_modules
+
     patch -p1 < "$srcdir/no-update.patch"
+    patch -p1 < "$srcdir/optimize_more.patch"
     cargo fetch --locked --target "$CARCH-unknown-linux-gnu"
 }
 
@@ -85,7 +89,8 @@ build() {
     export NODE_BINARY=$(which node)
     export YARN_BINARY=$(which yarn)
 
-    ./tools/build
+    export RELEASE=1
+    mold -run ./ninja wheels # use mold as linker to allow for LTO
 }
 
 pkgver(){
diff --git a/optimize_more.patch b/optimize_more.patch
new file mode 100644
index 000000000000..bf5cd0105e8e
--- /dev/null
+++ b/optimize_more.patch
@@ -0,0 +1,11 @@
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -37,7 +37,7 @@
+ debug = 0
+
+ [profile.dev.package.runner]
+-opt-level = 1
++opt-level = 3
+
+ # Debug info off by default, which speeds up incremental builds and produces a considerably
+ # smaller library.