From dc9235e3adc83d124dc30dfb0c5af62786747c8c Mon Sep 17 00:00:00 2001 From: Celeste <20312-Celeste@users.gitlab.alpinelinux.org> Date: Mon, 20 May 2024 06:39:17 +0000 Subject: [PATCH] main/tcl: take over maintainership also, fix lint warnings except for `default_prepare` not being called -- the custom `prepare()` function here is already applying patches (to "$builddir"/..) --- main/tcl/APKBUILD | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/main/tcl/APKBUILD b/main/tcl/APKBUILD index 4603def90784..fadb7dc6a0a5 100644 --- a/main/tcl/APKBUILD +++ b/main/tcl/APKBUILD @@ -1,21 +1,22 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> -# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org> +# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org> +# Maintainer: Celeste <cielesti@protonmail.com> pkgname=tcl pkgver=8.6.14 +pkgrel=1 _major=${pkgver%.*} -pkgrel=0 pkgdesc="The Tcl scripting language" url="https://www.tcl-lang.org/" arch="all" license="TCL" depends="tzdata" -depends_dev="tcl" +depends_dev="$pkgname=$pkgver-r$pkgrel" makedepends="zlib-dev sqlite-dev" subpackages="$pkgname-doc $pkgname-dev" source="https://downloads.sourceforge.net/sourceforge/tcl/tcl$pkgver-src.tar.gz tcl-stat64.patch " -builddir="$srcdir"/tcl$pkgver/unix +builddir="$srcdir/tcl$pkgver/unix" prepare() { cd "$srcdir"/tcl$pkgver @@ -32,6 +33,7 @@ build() { case "$CARCH" in x86_64) _64bit="--enable-64bit";; esac + ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -45,14 +47,15 @@ build() { } package() { - export LD_LIBRARY_PATH="$_builddir" make INSTALL_ROOT="$pkgdir" install install-private-headers ln -sf tclsh$_major "$pkgdir"/usr/bin/tclsh - install -Dm644 ../license.terms $pkgdir/usr/share/licenses/$pkgname/LICENSE + install -Dm644 ../license.terms \ + "$pkgdir"/usr/share/licenses/$pkgname/LICENSE # remove buildroot traces - find "$pkgdir" -name '*Config.sh' | xargs sed -i -e "s#${srcdir}#/usr/src#" + find "$pkgdir" -name '*Config.sh' -print0 | + xargs -0 sed -i -e "s#${srcdir}#/usr/src#" } check() { @@ -64,10 +67,9 @@ check() { dev() { default_dev - cd $pkgdir - for i in $(find . -name '*.c' -o -name '*Config.sh'); do - mkdir -p "$subpkgdir"/${i%/*} - mv $i "$subpkgdir"/${i%/*}/ + + local file; find "$pkgdir" -name '*Config.sh' | while read -r file; do + amove "${file#"$pkgdir"}" done } -- GitLab