diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2014-04-15 06:37:08 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-04-15 06:37:08 +0000 |
commit | 589cf8744233946b999555914e2fe738d0952959 (patch) | |
tree | 025e635c2b3998ffafe52c9f3f814878256d9919 | |
parent | 2bd201bd3fb668a988b729a7c9bf9e79bb067cff (diff) | |
download | alpine_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/APKBUILD | 9 |
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> |
3 | pkgname=musl | 3 | pkgname=musl |
4 | pkgver=1.0.0 | 4 | pkgver=1.0.0 |
5 | pkgrel=10 | 5 | pkgrel=11 |
6 | pkgdesc="the musl c library (libc) implementation" | 6 | pkgdesc="the musl c library (libc) implementation" |
7 | url="http://www.musl-libc.org/" | 7 | url="http://www.musl-libc.org/" |
8 | arch="all" | 8 | arch="all" |
9 | license="MIT" | 9 | license="MIT" |
10 | depends="" | 10 | depends="" |
11 | depends_dev="" | 11 | depends_dev="!uclibc-dev" |
12 | makedepends="$depends_dev" | 12 | makedepends="$depends_dev" |
13 | install="" | 13 | install="" |
14 | subpackages="$pkgname-dev $pkgname-utils" | 14 | subpackages="$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 | ||
103 | dev() { | ||
104 | replaces="uclibc-dev" | ||
105 | default_dev | ||
106 | } | ||
107 | |||
108 | utils() { | 103 | utils() { |
109 | replaces="uclibc-utils" | 104 | replaces="uclibc-utils" |
110 | mkdir -p "$subpkgdir"/usr/bin "$subpkgdir"/sbin | 105 | mkdir -p "$subpkgdir"/usr/bin "$subpkgdir"/sbin |