aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2014-04-23 13:28:53 +0300
committerTimo Teräs <timo.teras@iki.fi>2014-04-23 13:30:19 +0300
commit6aa1ef0e4e814c75bcd1beb7976da8decbacc52e (patch)
tree5735655dc4de2fa7439ea3b286d3b2083e33f5f4
parent3cf35758dff79cfbab499af63dc49453cdcef7d3 (diff)
downloadaports-6aa1ef0e4e814c75bcd1beb7976da8decbacc52e.tar.bz2
aports-6aa1ef0e4e814c75bcd1beb7976da8decbacc52e.tar.xz
main/musl: replace libiconv instead of conflict
libiconv exists and is empty. libiconv-dev exists and had empty libiconv.a as compatibility wrapper, so we need to be able to pull it in.
-rw-r--r--main/musl/APKBUILD5
1 files changed, 3 insertions, 2 deletions
diff --git a/main/musl/APKBUILD b/main/musl/APKBUILD
index 202038b72e..f37d49b87b 100644
--- a/main/musl/APKBUILD
+++ b/main/musl/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Timo Teräs <timo.teras@iki.fi>
pkgname=musl
pkgver=1.1.0
-pkgrel=3
+pkgrel=4
pkgdesc="the musl c library (libc) implementation"
url="http://www.musl-libc.org/"
arch="all"
@@ -101,7 +101,8 @@ package() {
}
utils() {
- depends="!uclibc-utils !libiconv"
+ depends="!uclibc-utils"
+ replaces="libiconv"
license="MIT BSD GPL2+"
mkdir -p "$subpkgdir"/usr/bin "$subpkgdir"/sbin