diff options
| author | Valery Kartel <valery.kartel@gmail.com> | 2015-12-10 16:50:14 +0200 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-12-11 10:06:38 +0000 |
| commit | adb195c56059b8d66bf34ed759373a8048c42914 (patch) | |
| tree | 5eec62219d035749b52ccbc7efa7464db14f3ed4 /main | |
| parent | 02e4b5bea0573a5570b61505a47ef06419f85550 (diff) | |
| download | aports-adb195c56059b8d66bf34ed759373a8048c42914.tar.bz2 aports-adb195c56059b8d66bf34ed759373a8048c42914.tar.xz | |
main/btrfs-progs: some fixes in APKBUILD. libraries moved to -libs subpackage
- remove unnecessary parameters in ./configure & make install
- don't know why libraries was in -dev subpackage. Move it to -libs subpackage
Diffstat (limited to 'main')
| -rw-r--r-- | main/btrfs-progs/APKBUILD | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/main/btrfs-progs/APKBUILD b/main/btrfs-progs/APKBUILD index c004bcd099..ed29946f59 100644 --- a/main/btrfs-progs/APKBUILD +++ b/main/btrfs-progs/APKBUILD @@ -1,8 +1,9 @@ +# Contributor: Valery Kartel <valery.kartel@gmail.com> # Contributor: Łukasz Jendrysik <scadu@yandex.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=btrfs-progs pkgver=4.3.1 -pkgrel=0 +pkgrel=1 pkgdesc="Tools for the btrfs" url="https://btrfs.wiki.kernel.org/" arch="all" @@ -12,8 +13,8 @@ makedepends="util-linux-dev bash attr-dev acl-dev e2fsprogs-dev zlib-dev lzo-dev asciidoc xmlto linux-headers autoconf automake libtool" install= -subpackages="$pkgname-doc $pkgname-dev $pkgname-bash-completion:completion" -source="https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${pkgver}.tar.xz +subpackages="$pkgname-doc $pkgname-dev $pkgname-bash-completion:completion $pkgname-libs" +source="https://www.kernel.org/pub/linux/kernel/people/kdave/$pkgname/$pkgname-v$pkgver.tar.xz includes.patch musl-compat.patch 0001-use-pthread_join-instead-of-pthread_tryjoin_np.patch @@ -36,7 +37,6 @@ build() { --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ - --disable-static \ --disable-backtrace \ || return 1 make || return 1 @@ -44,12 +44,7 @@ build() { package() { cd "$_builddir" - make -j1 prefix=/usr mandir=/usr/share/man DESTDIR="$pkgdir" install || return 1 -} - -dev() { - default_dev || return 1 - mv "$pkgdir"/usr/lib/*.so* "$subpkgdir"/usr/lib + make -j1 DESTDIR="$pkgdir" install || return 1 } completion() { |