aboutsummaryrefslogtreecommitdiffstats
path: root/main/eglibc
diff options
context:
space:
mode:
authorCarlo Landmeter <clandmeter@gmail.com>2013-01-11 17:03:54 +0000
committerCarlo Landmeter <clandmeter@gmail.com>2013-01-11 17:03:54 +0000
commit0c26b0d6e16370547d4b8cef4d97a7373935b2d1 (patch)
treea714dac14b8fca8b8280d1434a4d63a6bb56c28c /main/eglibc
parent7bbe192fb6512869682088722381a947e9c71b5e (diff)
downloadaports-0c26b0d6e16370547d4b8cef4d97a7373935b2d1.tar.bz2
aports-0c26b0d6e16370547d4b8cef4d97a7373935b2d1.tar.xz
main/eglibc: cleanup and remove tzselect
Diffstat (limited to 'main/eglibc')
-rw-r--r--main/eglibc/APKBUILD26
1 files changed, 20 insertions, 6 deletions
diff --git a/main/eglibc/APKBUILD b/main/eglibc/APKBUILD
index 2e25ca1db8..e1ac959ac4 100644
--- a/main/eglibc/APKBUILD
+++ b/main/eglibc/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer:
pkgname=eglibc
pkgver=2.17_svn20121226
-pkgrel=1
+pkgrel=2
pkgdesc="Embedded GLIBC is a variant of the GNU C Library that is designed to work well on embedded systems"
url="http://www.eglibc.org"
arch="all"
@@ -13,7 +13,7 @@ makedepends="$depends_dev gawk perl bash"
install=""
options="!strip ldpath-recursive"
triggers="$pkgname-utils.trigger=/lib:/usr/lib"
-subpackages="$pkgname-dev $pkgname-lang $pkgname-locales $pkgname-scripts
+subpackages="$pkgname-dev $pkgname-lang $pkgname-locales $pkgname-scripts $pkgname-pic
$pkgname-nscd libthread_db $pkgname-gconv $pkgname-mtrace $pkgname-utils"
source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.bz2
ld.so.conf nscd.initd ldd-sh.patch"
@@ -116,12 +116,12 @@ gconv() {
}
scripts() {
- # current tzselect unbash patch does not work waiting for upstream.
pkgdesc="eglibc scripts sotruss tzselect and xtrace based on bash"
depends="bash"
local i
mkdir -p "$subpkgdir"/usr/bin
- for i in sotruss xtrace tzselect; do
+ # tzselect removed in favor the on in tzdata.
+ for i in sotruss xtrace; do
mv "$pkgdir"/usr/bin/$i \
"$subpkgdir"/usr/bin/ || return 1
done
@@ -138,11 +138,25 @@ mtrace() {
utils() {
pkgdesc="eglibc utility programs"
replaces="uclibc-utils libiconv eglibc"
- mkdir -p "$subpkgdir"/usr/bin "$subpkgdir"/sbin
+ mkdir -p "$subpkgdir"/usr/bin \
+ "$subpkgdir"/sbin \
+ "$subpkgdir"/usr/sbin \
+ "$subpkgdir"/usr/lib
mv "$pkgdir"/sbin/* \
"$subpkgdir"/sbin/ || return 1
mv "$pkgdir"/usr/bin/* \
"$subpkgdir"/usr/bin/ || return 1
+ mv "$pkgdir"/usr/sbin/* \
+ "$subpkgdir"/usr/sbin/ || return 1
+ mv "$pkgdir"/usr/lib/pt_chown \
+ "$subpkgdir"/usr/lib/ || return 1
+}
+
+pic() {
+ pkgdesc="eglibc PIC archive library"
+ mkdir -p "$subpkgdir"/usr/lib
+ mv "$pkgdir"/usr/lib/*pic.map \
+ "$subpkgdir"/usr/lib/ || return 1
}
locales() {
@@ -177,7 +191,7 @@ dev() {
# do not depends on $pkgname-scripts and $pkgname-mtrace
# so we do not pull in bash and perl with eglibc-dev
depends="$pkgname $pkgname-lang $pkgname-locales $pkgname-nscd
- libthread_db $pkgname-gconv $pkgname-utils"
+ libthread_db $pkgname-gconv $pkgname-utils $pkgname-pic"
}
md5sums="41acb18d9024e1bc4a576bdebaf989ce eglibc-2.17_svn20121226.tar.bz2