From 5912528af0f62188ad05260f7dc790a93e8466c1 Mon Sep 17 00:00:00 2001 From: Valery Kartel Date: Mon, 27 Nov 2017 15:54:15 +0200 Subject: main/bash: move development data to -dev subpkg and add check --- main/bash/APKBUILD | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) (limited to 'main') diff --git a/main/bash/APKBUILD b/main/bash/APKBUILD index 7e9de29abe..6cf9bdfbda 100644 --- a/main/bash/APKBUILD +++ b/main/bash/APKBUILD @@ -6,7 +6,7 @@ pkgver=4.4.12 _patchlevel=${pkgver##*.} _myver=${pkgver%.*} _patchbase=${_myver/./} -pkgrel=1 +pkgrel=2 pkgdesc="The GNU Bourne Again shell" url="https://www.gnu.org/software/bash/bash.html" arch="all" @@ -15,7 +15,7 @@ makedepends_build="bison flex" makedepends_host="readline-dev ncurses-dev" depends="" install="$pkgname.post-install $pkgname.post-upgrade $pkgname.pre-deinstall" -subpackages="$pkgname-doc" +subpackages="$pkgname-dev $pkgname-doc" source="http://ftp.gnu.org/gnu/bash/bash-${_myver}.tar.gz bash-noinfo.patch " @@ -33,7 +33,7 @@ done # 4.4.12-r1: # - CVE-2016-0634 -builddir="$srcdir"/$pkgname-$_myver +builddir="$srcdir/$pkgname-$_myver" prepare() { cd "$builddir" @@ -75,13 +75,25 @@ build() { make y.tab.c && make builtins/libbuiltins.a && make } +check() { + cd "$builddir" + make test +} + package() { - cd ${startdir}/src/${pkgname}-${_myver} - make DESTDIR=${pkgdir} install + cd "$builddir" + make DESTDIR="$pkgdir" install rm -rf "$pkgdir"/usr/share/locale } +dev() { + default_dev + mkdir -p "$subpkgdir"/bin "$subpkgdir"/usr/lib/$pkgname + mv "$pkgdir"/bin/${pkgname}bug "$subpkgdir"/bin + mv "$pkgdir"/usr/lib/$pkgname/Makefile* "$subpkgdir"/usr/lib/$pkgname +} + sha512sums="73de3b425faaac55e45456b0f6f6d8077b5dfa7bb76e0d1894a19361b4a2b6bd4fbbe182117ddbfe9b07b4d898fba03537c261badc9533dd3c0da891764c7f29 bash-4.4.tar.gz 9d8845491d0fe335bdd8e9a2bd98bda54bfed2ae3c35b2196c6d5a38bdf96c4d97572ba7d6b19ab605ef4e8f001f64cf3312f87dedebb9e37a95ad2c44e33cdb bash-noinfo.patch fa7a1b277eb3bad6ae7d2c7a2887cbf2c0eb75b7fee8ed03ec1e9d45879a2fb4b8c7cb16d6b029987493b01a461214bd9a24454a6837e7cfe180b1bc56f61caa bash44-001 -- cgit v1.2.3