From 6aa1ef0e4e814c75bcd1beb7976da8decbacc52e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
Date: Wed, 23 Apr 2014 13:28:53 +0300
Subject: [PATCH] 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.
---
main/musl/APKBUILD | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/main/musl/APKBUILD b/main/musl/APKBUILD
index 202038b72e7b..f37d49b87bf3 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
--
GitLab