aboutsummaryrefslogtreecommitdiff
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
parent2bd201bd3fb668a988b729a7c9bf9e79bb067cff (diff)
downloadalpine_aports-589cf8744233946b999555914e2fe738d0952959.tar.bz2
alpine_aports-589cf8744233946b999555914e2fe738d0952959.tar.xz
alpine_aports-589cf8744233946b999555914e2fe738d0952959.zip
main/musl: make uclibc-dev conflict
This is better than replaces
-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 @@
2# Maintainer: Timo Teräs <timo.teras@iki.fi> 2# Maintainer: Timo Teräs <timo.teras@iki.fi>
3pkgname=musl 3pkgname=musl
4pkgver=1.0.0 4pkgver=1.0.0
5pkgrel=10 5pkgrel=11
6pkgdesc="the musl c library (libc) implementation" 6pkgdesc="the musl c library (libc) implementation"
7url="http://www.musl-libc.org/" 7url="http://www.musl-libc.org/"
8arch="all" 8arch="all"
9license="MIT" 9license="MIT"
10depends="" 10depends=""
11depends_dev="" 11depends_dev="!uclibc-dev"
12makedepends="$depends_dev" 12makedepends="$depends_dev"
13install="" 13install=""
14subpackages="$pkgname-dev $pkgname-utils" 14subpackages="$pkgname-dev $pkgname-utils"
@@ -100,11 +100,6 @@ package() {
100 ln -sf ../../lib/"$LDSO" "$pkgdir"/usr/bin/ldd || return 1 100 ln -sf ../../lib/"$LDSO" "$pkgdir"/usr/bin/ldd || return 1
101} 101}
102 102
103dev() {
104 replaces="uclibc-dev"
105 default_dev
106}
107
108utils() { 103utils() {
109 replaces="uclibc-utils" 104 replaces="uclibc-utils"
110 mkdir -p "$subpkgdir"/usr/bin "$subpkgdir"/sbin 105 mkdir -p "$subpkgdir"/usr/bin "$subpkgdir"/sbin