aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2014-04-15 06:37:08 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2014-04-15 06:37:08 +0000
commit589cf8744233946b999555914e2fe738d0952959 (patch)
tree025e635c2b3998ffafe52c9f3f814878256d9919 /main
parent2bd201bd3fb668a988b729a7c9bf9e79bb067cff (diff)
downloadaports-589cf8744233946b999555914e2fe738d0952959.tar.bz2
aports-589cf8744233946b999555914e2fe738d0952959.tar.xz
main/musl: make uclibc-dev conflict
This is better than replaces
Diffstat (limited to 'main')
-rw-r--r--main/musl/APKBUILD9
1 files changed, 2 insertions, 7 deletions
diff --git a/main/musl/APKBUILD b/main/musl/APKBUILD
index 8120bc093d..6d3817af11 100644
--- a/main/musl/APKBUILD
+++ b/main/musl/APKBUILD
@@ -2,13 +2,13 @@
# Maintainer: Timo Teräs <timo.teras@iki.fi>
pkgname=musl
pkgver=1.0.0
-pkgrel=10
+pkgrel=11
pkgdesc="the musl c library (libc) implementation"
url="http://www.musl-libc.org/"
arch="all"
license="MIT"
depends=""
-depends_dev=""
+depends_dev="!uclibc-dev"
makedepends="$depends_dev"
install=""
subpackages="$pkgname-dev $pkgname-utils"
@@ -100,11 +100,6 @@ package() {
ln -sf ../../lib/"$LDSO" "$pkgdir"/usr/bin/ldd || return 1
}
-dev() {
- replaces="uclibc-dev"
- default_dev
-}
-
utils() {
replaces="uclibc-utils"
mkdir -p "$subpkgdir"/usr/bin "$subpkgdir"/sbin