diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2010-01-06 10:29:33 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2010-01-06 10:30:23 +0000 |
| commit | cccd5e0e91e3fd71dbc2d4258256cdcb10feaf98 (patch) | |
| tree | 7dc929312f1165bdc2583abc058b7e5c36dfcb1f | |
| parent | 9e21fe7969bb9515ac80bfb4bc17ad7570844bc9 (diff) | |
| download | aports-cccd5e0e91e3fd71dbc2d4258256cdcb10feaf98.tar.bz2 aports-cccd5e0e91e3fd71dbc2d4258256cdcb10feaf98.tar.xz | |
main/uclibc: build against 2.6.32 headers
the /usr/include/scsi/scsi.h is now provided by kernel headers
| -rw-r--r-- | main/uclibc/APKBUILD | 25 | ||||
| -rw-r--r-- | main/uclibc/uclibcconfig.x86 (renamed from main/uclibc/uclibcconfig) | 0 |
2 files changed, 13 insertions, 12 deletions
diff --git a/main/uclibc/APKBUILD b/main/uclibc/APKBUILD index ca217c06..8463c981 100644 --- a/main/uclibc/APKBUILD +++ b/main/uclibc/APKBUILD @@ -1,14 +1,14 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=uclibc pkgver=0.9.30.1 -pkgrel=18 +pkgrel=19 pkgdesc="C library for developing embedded Linux systems" url=http://uclibc.org license="LGPL-2" _mynamever=uClibc-$pkgver subpackages="$pkgname-dev" -depends_dev="linux-headers" +depends_dev="linux-headers=>2.6.32" source="http://uclibc.org/downloads/$_mynamever.tar.bz2 $pkgname-0.9.30.1-resolv.patch @@ -25,7 +25,7 @@ source="http://uclibc.org/downloads/$_mynamever.tar.bz2 uclibc-fork-hidden.diff uclibc-fork-hook.diff uclibc-getaddrinfo-netlink.diff - uclibcconfig + uclibcconfig.x86 " # backport openat funcs source="$source @@ -34,7 +34,10 @@ source="$source 0003-remove-libc_hidden_def-mknodat.patch " -_prepare() { +_config="$srcdir"/uclibcconfig.${ARCH:-x86} + + +prepare() { local i gcc_major cd "$srcdir/$_mynamever/" # patches goes here @@ -44,23 +47,21 @@ _prepare() { done } -_compile() { +build() { cd "$srcdir/$_mynamever/" - cp ../uclibcconfig .config + cp "$_config" .config make silentoldconfig # this is a hack to get uclibc-i386-floating-stacks.diff working touch libc/sysdeps/linux/i386/sysdep.h make || return 1 } -_install() { +package() { cd "$srcdir/$_mynamever/" make install DESTDIR="$pkgdir" install_utils install -Dm755 extra/scripts/getent "$pkgdir"/usr/bin/getent -} - -build() { - _prepare && _compile && _install + # provided by linux-headers + rm -f "$pkgdir"/usr/include/scsi/scsi.h } md5sums="1a4b84e5536ad8170563ffa88c34679c uClibc-0.9.30.1.tar.bz2 @@ -78,7 +79,7 @@ bbb8475963e791f596c34c81ef5583d7 uclibc-resolv-cname-fix.diff 220260c979eca4558827d0e7ec8aa8b6 uclibc-fork-hidden.diff 55bb709f5efd937df323f0d39a202cfd uclibc-fork-hook.diff a7310494a8073ebd43e1d437657532ef uclibc-getaddrinfo-netlink.diff -36b28777f4c49af39268920fbade41b1 uclibcconfig +36b28777f4c49af39268920fbade41b1 uclibcconfig.x86 329b92fec717c8808c3fa9ffd68f2dfb 0001-first-pass-at-implementing-at-funcs.patch 7ffa41082d9de2bc512b4bed9577bdf9 0002-add-hidden-aliases-for-openat-funcs.patch e12c647716eef19dd4ad08602dcc435b 0003-remove-libc_hidden_def-mknodat.patch" diff --git a/main/uclibc/uclibcconfig b/main/uclibc/uclibcconfig.x86 index 78835525..78835525 100644 --- a/main/uclibc/uclibcconfig +++ b/main/uclibc/uclibcconfig.x86 |