aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSören Tempel <soeren+git@soeren-tempel.net>2021-07-21 07:56:53 +0200
committerSören Tempel <soeren+git@soeren-tempel.net>2021-07-21 07:56:53 +0200
commit288bf363d5a69eb6c528ac94dee4493d0074eb27 (patch)
treee5b710d8faee523fab101b82516233f5b50ff011
parent4eaa5daa9c3f92cbcb8d641d0766502fc01a6508 (diff)
downloadaports-288bf363d5a69eb6c528ac94dee4493d0074eb27.tar.gz
aports-288bf363d5a69eb6c528ac94dee4493d0074eb27.tar.bz2
aports-288bf363d5a69eb6c528ac94dee4493d0074eb27.tar.xz
testing/icmake: never attempt to clear screen during build process
Should fix testing/yodl build on riscv64.
-rw-r--r--testing/icmake/APKBUILD11
-rw-r--r--testing/icmake/disable-clear-screen.patch26
2 files changed, 34 insertions, 3 deletions
diff --git a/testing/icmake/APKBUILD b/testing/icmake/APKBUILD
index 54935cf027..7412387a34 100644
--- a/testing/icmake/APKBUILD
+++ b/testing/icmake/APKBUILD
@@ -2,14 +2,16 @@
# Maintainer: Shiz <hi@shiz.me>
pkgname=icmake
pkgver=9.02.08
-pkgrel=1
+pkgrel=2
pkgdesc="Make utility using a C-like grammar"
url="https://fbb-git.github.io/icmake/"
arch="all"
license="GPL-3.0-or-later"
makedepends="bash"
subpackages="$pkgname-doc"
-source="https://gitlab.com/fbb-git/icmake/-/archive/$pkgver/icmake-$pkgver.tar.bz2"
+source="https://gitlab.com/fbb-git/icmake/-/archive/$pkgver/icmake-$pkgver.tar.bz2
+ disable-clear-screen.patch"
+patch_args="-p2"
builddir="$srcdir/icmake-$pkgver/icmake"
prepare() {
@@ -29,4 +31,7 @@ package() {
./icm_install strip all "$pkgdir"
}
-sha512sums="d88877b7d575ce905639b5ee37008718623dfff910da547b11be9e22f1696f30809c438bf702a54a2709b9b4d6cdd929b7e28e41ae2923b8ceffbc058102b76b icmake-9.02.08.tar.bz2"
+sha512sums="
+d88877b7d575ce905639b5ee37008718623dfff910da547b11be9e22f1696f30809c438bf702a54a2709b9b4d6cdd929b7e28e41ae2923b8ceffbc058102b76b icmake-9.02.08.tar.bz2
+7eedfec5afca771db4253335a378aac8fa61fbdb9ce6072183e65fd303bce28bdf0bb0e1c3dd28fa6fe6ecfdb931945c56679ec7e3feb1c5980aa30aec85e66d disable-clear-screen.patch
+"
diff --git a/testing/icmake/disable-clear-screen.patch b/testing/icmake/disable-clear-screen.patch
new file mode 100644
index 0000000000..6034df1604
--- /dev/null
+++ b/testing/icmake/disable-clear-screen.patch
@@ -0,0 +1,26 @@
+This patch has been taken from ArchLinux. It should fix the yodl build
+on riscv64 and it's generally very undesirable to use tput(1) for
+buildlogs generated by the Alpine builders.
+
+commit 42d3987d08e41723a2ca8739550bbf5d58e45ea8
+Author: Baptiste Jonglez <git@bitsofnetworks.org>
+Date: Sat Jul 7 12:58:54 2018 +0200
+
+ Disable screen clearing
+
+ This tends to fail when building in a clean chroot (e.g. yodl) because of
+ missing terminal definition, and is of dubious interest anyway.
+
+diff --git a/icmake/scripts/icmbuild.in b/icmake/scripts/icmbuild.in
+index c31e925..dba9607 100644
+--- a/icmake/scripts/icmbuild.in
++++ b/icmake/scripts/icmbuild.in
+@@ -618,7 +618,7 @@ void install(string what, string path)
+
+ void clearScreen(int cls)
+ {
+- if (cls)
++ if (0)
+ system("tput clear");
+ }
+