Skip to content

Commit

Permalink
community/tilix: fix build
Browse files Browse the repository at this point in the history
  • Loading branch information
jvvv committed Nov 23, 2024
1 parent 92cc27f commit 123858c
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 1 deletion.
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
From 9da1c90d8a072ad778da0612418a1729cf2ce3cb Mon Sep 17 00:00:00 2001
From: Andrei Horodniceanu <[email protected]>
Date: Mon, 29 Apr 2024 08:40:20 +0300
Subject: [PATCH] meson.build: add `-allinst` when compiling, #2210

This is needed to work around a bug in dmd regarding template
emissions.

Bug: https://github.com/gnunn1/tilix/issues/2210
Bug: https://issues.dlang.org/show_bug.cgi?id=20668

Signed-off-by: Andrei Horodniceanu <[email protected]>
---
meson.build | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/meson.build b/meson.build
index 73f3ebe8..4b02225d 100644
--- a/meson.build
+++ b/meson.build
@@ -5,12 +5,17 @@ project(
meson_version: '>= 0.56'
)

+# As a workaround for https://issues.dlang.org/show_bug.cgi?id=20668
+# add -allinst
compiler = meson.get_compiler('d')
if compiler.get_id() == 'llvm'
- d_extra_args = ['-vcolumns']
+ d_extra_args = ['-allinst', '-vcolumns']
d_link_args = []
-else
- d_extra_args = []
+elif compiler.get_id() == 'dmd'
+ d_extra_args = ['-allinst']
+ d_link_args = []
+elif compiler.get_id() == 'gcc'
+ d_extra_args = ['-fall-instantiations']
d_link_args = []
endif

--
2.47.0

4 changes: 3 additions & 1 deletion community/tilix/APKBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <[email protected]>
pkgname=tilix
pkgver=1.9.6
pkgrel=1
pkgrel=2
pkgdesc="Tiling terminal emulator for Linux"
url="https://gnunn1.github.io/tilix-web/"
arch="x86_64 aarch64"
Expand All @@ -26,6 +26,7 @@ subpackages="$pkgname-doc $pkgname-lang"
source="https://github.com/gnunn1/tilix/archive/$pkgver/tilix-$pkgver.tar.gz
musl-hacks.patch
dont-use-libunwind.patch
0001-meson.build-add-allinst-when-compiling-2210.patch
"

build() {
Expand All @@ -42,4 +43,5 @@ sha512sums="
2d51e8c0203863573e52c7bf68a66ba4ec58f929ecebf90bb68bae3f15d9f745f956fc524b7dd23d1804d5130dd0bf39ff834d262042375448e53714021338f6 tilix-1.9.6.tar.gz
3347bfebb0e4d011d9b17f31ed15ec79e503de76185757165c7c13daa6e8b566eb0ad3a7cf32775ee4bc6102da1fa593d3dd0ff57767748c911ec46ad53d4bc3 musl-hacks.patch
4a1ccc6011d64b78a7f2a93ca91eec36004c5e5d4e826efc115f860c3013bd52477324b586340e18849bce445c56d7d8b909393694ec43a3b11d0c85e6ad59c3 dont-use-libunwind.patch
b079297efaa500081523c2c7800fef26c3f4204fc57dcbe384e56a026b69a1ce471b1c97dd5620e87ac9e0b1bbde3bd46ab6fb0f0e3ee14c8fd4bcff78cad156 0001-meson.build-add-allinst-when-compiling-2210.patch
"

0 comments on commit 123858c

Please sign in to comment.