diff options
| -rw-r--r-- | testing/kbuild/APKBUILD | 10 | ||||
| -rw-r--r-- | testing/kbuild/sys_siglist.patch | 13 | ||||
| -rw-r--r-- | testing/kbuild/uclibc.patch | 20 |
3 files changed, 27 insertions, 16 deletions
diff --git a/testing/kbuild/APKBUILD b/testing/kbuild/APKBUILD index 5688647e05..1d95fc8380 100644 --- a/testing/kbuild/APKBUILD +++ b/testing/kbuild/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=kbuild -pkgver=0.1.5_p2 +pkgver=0.1.9998_pre20120806 _ver=${pkgver/_/-} pkgrel=0 pkgdesc="A makefile framework for writing simple makefiles for complex tasks" @@ -13,7 +13,7 @@ depends_dev="" makedepends="autoconf automake flex bison" install="" subpackages="$pkgname-doc" -source="ftp://ftp.netlabs.org/pub/kbuild/kBuild-$_ver-src.tar.gz +source="http://dev.gentoo.org/~polynomial-c/kBuild-${_ver}-src.tar.xz kbuild-0.1.5_p2-qa.patch lchmod.patch strlcpy.patch @@ -59,10 +59,10 @@ package() { || return 1 } -md5sums="5e4e2193aa6cb3f095af2f99bf90d01d kBuild-0.1.5-p2-src.tar.gz +md5sums="520d65bd2356c26d1b9bbb25fd7d70ce kBuild-0.1.9998-pre20120806-src.tar.xz 79d4d445b28f0c50f2a7a8ca12bbed4b kbuild-0.1.5_p2-qa.patch b3dd26cc185c96658d9b554eef2f811c lchmod.patch 90cae3b53b4ec6fc5f1c336922083df0 strlcpy.patch ca09174d7c885fdea1e3c2dc580d80b3 underlinking.patch -234e03febb8eb35106ecf85682e9233a sys_siglist.patch -4bf9eead328a38059dadb56317e7aaa4 uclibc.patch" +52c3450a3e2645f57871b0141c465776 sys_siglist.patch +b3c2d0e6902f1285c09d81f74e573c4f uclibc.patch" diff --git a/testing/kbuild/sys_siglist.patch b/testing/kbuild/sys_siglist.patch index 883b2ef3ad..140b8a0169 100644 --- a/testing/kbuild/sys_siglist.patch +++ b/testing/kbuild/sys_siglist.patch @@ -13,3 +13,16 @@ index 146326a..cbf0c3e 100644 else fmtstr(s + col, 16, "Signal %d", st); if (WCOREDUMP(ps->status)) { +--- ./src/kash/jobs.c.orig ++++ ./src/kash/jobs.c +@@ -396,8 +396,8 @@ + #endif + st = WTERMSIG(ps->status); + st &= 0x7f; +- if (st < NSIG && sys_siglist[st]) +- scopyn(sys_siglist[st], s + col, 32); ++ if (st < NSIG && strsignal(st)) ++ scopyn(strsignal(st), s + col, 32); + else + fmtstr(s + col, 16, "Signal %d", st); + if (WCOREDUMP(ps->status)) { diff --git a/testing/kbuild/uclibc.patch b/testing/kbuild/uclibc.patch index cf38529f17..f837ca3c78 100644 --- a/testing/kbuild/uclibc.patch +++ b/testing/kbuild/uclibc.patch @@ -1,24 +1,22 @@ --- ./src/lib/k/kDefs.h.orig +++ ./src/lib/k/kDefs.h -@@ -78,7 +78,7 @@ - # define K_OS K_OS_DRAGONFLY - # elif defined(__FreeBSD__) /*??*/ +@@ -82,7 +82,7 @@ # define K_OS K_OS_FREEBSD + # elif defined(__HAIKU__) + # define K_OS K_OS_HAIKU -# elif defined(__gnu_linux__) -+# elif defined(__gnu_linux__) || defined(__UCLIBC__) ++# elif defined(__linux__) # define K_OS K_OS_LINUX # elif defined(__NetBSD__) /*??*/ # define K_OS K_OS_NETBSD -diff --git a/src/kmk/kmkbuiltin/fts.c b/src/kmk/kmkbuiltin/fts.c -index f913f17..febb900 100644 ---- a/src/kmk/kmkbuiltin/fts.c -+++ b/src/kmk/kmkbuiltin/fts.c -@@ -75,7 +75,7 @@ __RCSID("$NetBSD: __fts13.c,v 1.44 2005/01/19 00:59:48 mycroft Exp $"); +--- ./src/kmk/kmkbuiltin/fts.c.orig ++++ ./src/kmk/kmkbuiltin/fts.c +@@ -75,7 +75,7 @@ #endif #if ! HAVE_NBTOOL_CONFIG_H --# if !defined(__sun__) && !defined(__gnu_linux__) -+# if !defined(__sun__) && !defined(__gnu_linux__) && !defined(__UCLIBC__) +-# if !defined(__sun__) && !defined(__gnu_linux__) && !defined(__HAIKU__) ++# if !defined(__sun__) && !defined(__linux__) && !defined(__HAIKU__) # define HAVE_STRUCT_DIRENT_D_NAMLEN 1 # endif #endif |