aboutsummaryrefslogtreecommitdiffstats
path: root/community/kbuild
diff options
context:
space:
mode:
Diffstat (limited to 'community/kbuild')
-rw-r--r--community/kbuild/APKBUILD86
-rw-r--r--community/kbuild/glob.patch19
-rw-r--r--community/kbuild/kbuild-0.1.9998_pre20110817-gcc-4.7.patch12
-rw-r--r--community/kbuild/obstack.patch40
-rw-r--r--community/kbuild/os-linux.patch26
-rw-r--r--community/kbuild/strlcpy.patch13
-rw-r--r--community/kbuild/sys_siglist.patch13
-rw-r--r--community/kbuild/uclibc.patch22
8 files changed, 59 insertions, 172 deletions
diff --git a/community/kbuild/APKBUILD b/community/kbuild/APKBUILD
index 204a82d38bf..149c73b55bb 100644
--- a/community/kbuild/APKBUILD
+++ b/community/kbuild/APKBUILD
@@ -1,9 +1,9 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=kbuild
-pkgver=0.1.9998_pre20131130
+pkgver=0.1.9998.3149
_ver=${pkgver/_/-}
-pkgrel=1
+pkgrel=0
pkgdesc="A makefile framework for writing simple makefiles for complex tasks"
url="http://svn.netlabs.org/kbuild/wiki"
arch="x86 x86_64"
@@ -13,34 +13,33 @@ depends_dev=""
makedepends="autoconf automake flex bison"
install=""
subpackages="$pkgname-doc"
-source="https://dev.gentoo.org/~polynomial-c/kBuild-${_ver}-src.tar.xz
+source="https://dev.gentoo.org/~polynomial-c/kbuild-${_ver}-src.tar.xz
lchmod.patch
- strlcpy.patch
underlinking.patch
sys_siglist.patch
- kbuild-0.1.9998_pre20110817-gcc-4.7.patch
0001-define-ALLPERMS-is-missing.patch
sys-types.patch
- uclibc.patch
kobjcache.patch
obstack.patch
- glob.patch"
+ os-linux.patch
+ "
-_builddir="$srcdir"/kBuild-$_ver
+builddir="$srcdir"/kbuild-$_ver
prepare() {
+ default_prepare
local i
- cd "$_builddir"
- for i in $source; do
- case $i in
- *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
- esac
- done
- cd "$_builddir"/src/kmk
- aclocal -I config && autoheader && autoconf && automake --add-missing \
- || return 1
- cd "$_builddir"/src/sed
- aclocal -I config && autoheader && autoconf && automake --add-missing \
- || return 1
+ cd "$builddir"
+ # Add a file with the svn revision this package was pulled from
+ printf '%s\n' "KBUILD_SVN_REV := ${pkgver##*.}" > SvnInfo.kmk
+
+ # bootstrapping breaks because of missing po/Makefile.in.in (r3149)
+ sed '/^AC_CONFIG_FILES/s@ po/Makefile\.in@@' \
+ -i src/kmk/configure.ac
+
+ cd "$builddir"/src/kmk
+ aclocal -I config && autoheader && autoconf && automake --add-missing
+ cd "$builddir"/src/sed
+ aclocal -I config && autoheader && autoconf && automake --add-missing
# the bootstrap process will create a symlink to the system shell,
# which happens to be (/bin/sh) a symlink to /bin/busybox
@@ -49,54 +48,25 @@ prepare() {
echo '#!/bin/sh' >"$srcdir"/sh
echo 'exec /bin/busybox sh "$@"' >> "$srcdir"/sh
chmod +x "$srcdir"/sh
- sed -i -e "s:/bin/sh:$srcdir/sh:" "$_builddir"/bootstrap.gmk
+ sed -i -e "s:/bin/sh:$srcdir/sh:" "$builddir"/bootstrap.gmk
}
build() {
- cd "$_builddir"
- kBuild/env.sh --full make -f bootstrap.gmk AUTORECONF=true \
- || return 1
+ cd "$builddir"
+ kBuild/env.sh --full make -f bootstrap.gmk AUTORECONF=true
}
package() {
- cd "$_builddir"
- kBuild/env.sh kmk NIX_INSTALL_DIR=/usr PATH_INS="$pkgdir" install \
- || return 1
+ cd "$builddir"
+ kBuild/env.sh kmk NIX_INSTALL_DIR=/usr PATH_INS="$pkgdir" install
}
-md5sums="a9fad7d9c26dba44c2c1ad3d93d49372 kBuild-0.1.9998-pre20131130-src.tar.xz
-b3dd26cc185c96658d9b554eef2f811c lchmod.patch
-9b101e058900afb9986689076a214d54 strlcpy.patch
-ca09174d7c885fdea1e3c2dc580d80b3 underlinking.patch
-52c3450a3e2645f57871b0141c465776 sys_siglist.patch
-2fdb2fb96c48371b2a15785926c9144b kbuild-0.1.9998_pre20110817-gcc-4.7.patch
-4fda881d60b2c80502ad4321d18161a4 0001-define-ALLPERMS-is-missing.patch
-a4ad5a3bf960394856b9fafecfe921d4 sys-types.patch
-b3c2d0e6902f1285c09d81f74e573c4f uclibc.patch
-e92680df9641e25dd4a58e6a2733dbea kobjcache.patch
-4d8f14019970a974b6fde15fd4b991d9 obstack.patch
-db70c6fd949946029a6c95c0f7d565db glob.patch"
-sha256sums="def0a44cc0a91b6aa8a80f73ace0cfc315f298ba3e0d3d81fe52834091b68586 kBuild-0.1.9998-pre20131130-src.tar.xz
-79909f11e631757140c5095af1347c9f48c065f25cdd875c555477529ca6a693 lchmod.patch
-132305af7aa1cc94f4920ffe97775efcb6f0495f165035051298984d9f5ca4c0 strlcpy.patch
-1c99c0579af3d9cf4148b7b61d98b92ff86eaec441b6630754007ae3c3b5a2cc underlinking.patch
-8adb0ffa45a0b49737bbde54b54405a7708a2281d608d8f713437fce77e11d07 sys_siglist.patch
-420caeee42dca3fa9a474faa3ae6e34a884d26792ab3b6567a3b9ecf678a90e7 kbuild-0.1.9998_pre20110817-gcc-4.7.patch
-c308a64bddc997826ee83dc8f165ad5072368cb2c837a97308e69238a0390d7e 0001-define-ALLPERMS-is-missing.patch
-21ec6669485f97e0af37f3120bea2f688ed96df9c59a89cf1043645464db7a46 sys-types.patch
-1f581e0cf8fefae174c8aeb1b279e956fc7712146bf4a58451f0b318795309e9 uclibc.patch
-1f9788d65c597346f64cd2513875ed65d4ac199ce879dc313ce2970f40013f77 kobjcache.patch
-7093e35ca03c4b82961157225c5509c42b9996128b31b5ec32154a72c154848e obstack.patch
-93a1cd4ebfdd22179299bc9f029a1e7800ff842a5775555c4fe1a1f322f910c0 glob.patch"
-sha512sums="66f418c0e052389d2b5cfc4d46bc8598ceaeded369151047e455e921bef494ec42099cdc368d24b572eacd809bb7c124d07e0fab54788af01664b72f571fb047 kBuild-0.1.9998-pre20131130-src.tar.xz
+sha512sums="74808e6279c01739170535655edbbffb73809f60b18c7ee63a110af7af651628789b9e5d253821f5685f8e8c072890c4669493e64886f53587b810ea0f67826c kbuild-0.1.9998.3149-src.tar.xz
3ab991b13a122e82125392d01e27ad8c06f2b5f5e0c5bb2fa024fdcf16a65f5f460c14222d84d50b31a2ad4040c89871ee2a47f885eca329c15bb9abb3f8f5df lchmod.patch
-fbab0dc51f4e2d14b020a6b63820a26eeee884ac9cfd5b59a6afc6243ffb7679c775ed8529f6161917bf3cc5e2a651c959706cdc404a4a79c1b29cc9f3a614a5 strlcpy.patch
839c12659ae81e99c0c2f35f045ef8651c2d30ddb391ae76995ded6df19f4ca5ae728da96c16b7aab08cdf447030de645455751122a390755e0ff46c03cb23d6 underlinking.patch
-2e0cb32b6e296d92c4c092f798e83eee1fe49753826426fd957f9977149b64487547f71bde64b654a3f3a0511dfa9ac1c533ad0cd469c7bdd7e0acdfa3c2e3ac sys_siglist.patch
-7a0618e9dbd18ba10f1afd9c2a47f6efb136143a86008d2562eb2ff704f289b7150bbc10f2e3c57341b485252366ff46d49bd70c24cadba45f09496333ceaa76 kbuild-0.1.9998_pre20110817-gcc-4.7.patch
+a2c765d16d8b6c4c24c68d1f2754c7b7fa99b83e5456994df54a2d3ac41104fc3ad307434a0b8d94114aa667b07d9b7478e160a75267414b3daa436ea05e208a sys_siglist.patch
4bdcae4362ff0ac6b401c65120f54e395a41b98d4bdea796a1e85405c3444853b94626c2be6d9d703ffd904fb89ea0a14d1e847a67eb56d81faf48246220e166 0001-define-ALLPERMS-is-missing.patch
58ae3ec4a1535fddd4af67803c081c9ca4cd66244ea2a7ddfbf59eb5b849421377116376d893d5e643a15413b902463affa51153afeb2d2217bac135122b66a5 sys-types.patch
-41d568b05af4d9f650e736cafc4fd4285cc592726de1ee3f599b26cf2277a9436477ff512b99c2dbe1abc3d21cb9d4f24a0568aa71418e2114e294171cc008f0 uclibc.patch
7afcc78589ee66c60dd7a73819b4776531a4fc0f73c8a8824f4b53967f7c903095206455d2b113288ad4cf337e67c0dc82cd679b994096c5d9270f83d55689ad kobjcache.patch
-dae18964bb4c7f46e277b147bae53cabb03d5bbd6199ec5a8deeaf6a6d12804b281ea6debf7eda44fee3bff12d6097d7b46385617a446e2a2a7570d83d03eb8e obstack.patch
-006a65b7c4fe968ea44362804888a0214ff696a2ce9dfbb3e3c9bd5a595bd91b018919e35bc0a2f587677f7606acab57c6f7531bdf7f122fc08c8c99b04fddab glob.patch"
+9f7a2baa250baf8da686d52d16cacae3648e70b044c812bfb3e33100675a1de010b86cf2bdd39d86b957c5ccd16790c443918d0f0a66dfd5b5d7209b667a255b obstack.patch
+042dee4ff7720708bee55982c876ce48645f856c902481317dad9abacc405aede40b9c4f7078bf0fe3a8fa85c788de029e7bbc6b1c5ad668a842265f6a9a873e os-linux.patch"
diff --git a/community/kbuild/glob.patch b/community/kbuild/glob.patch
deleted file mode 100644
index 57b4dafadca..00000000000
--- a/community/kbuild/glob.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- ./src/kmk/Makefile.kmk.orig
-+++ ./src/kmk/Makefile.kmk
-@@ -60,6 +60,7 @@
- TEMPLATE_BIN-KMK_INCS.haiku = glob
- TEMPLATE_BIN-KMK_INCS.openbsd = glob
- TEMPLATE_BIN-KMK_INCS.solaris = glob
-+TEMPLATE_BIN-KMK_INCS.linux = glob
- TEMPLATE_BIN-KMK_LIBS = $(TEMPLATE_BIN-THREADED_LIBS) $(kmkmissing_1_TARGET) $(LIB_KUTIL)
- ifdef ELECTRIC_HEAP # for electric heap (see electric.c) - windows only.
- ifeq ($(KBUILD_TARGET),win)
-@@ -108,7 +109,7 @@
- glob/fnmatch.c
-
- kmkmissing_SOURCES.linux += \
-- kmkbuiltin/strlcpy.c
-+ glob/glob.c getloadavg.c
-
- kmkmissing_SOURCES.openbsd = \
- kmkbuiltin/openbsd.c \
diff --git a/community/kbuild/kbuild-0.1.9998_pre20110817-gcc-4.7.patch b/community/kbuild/kbuild-0.1.9998_pre20110817-gcc-4.7.patch
deleted file mode 100644
index 435b3f57fbd..00000000000
--- a/community/kbuild/kbuild-0.1.9998_pre20110817-gcc-4.7.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN kBuild-0.1.9998-pre20110817-orig/src/sed/lib/regex_internal.c kBuild-0.1.9998-pre20110817/src/sed/lib/regex_internal.c
---- kBuild-0.1.9998-pre20110817-orig/src/sed/lib/regex_internal.c 2011-08-17 14:28:42.000000000 -0700
-+++ kBuild-0.1.9998-pre20110817/src/sed/lib/regex_internal.c 2012-06-16 13:55:05.341176965 -0700
-@@ -781,7 +781,7 @@
- }
-
- static unsigned char
--internal_function __attribute ((pure))
-+internal_function
- re_string_fetch_byte_case (re_string_t *pstr)
- {
- if (BE (!pstr->mbs_allocated, 1))
diff --git a/community/kbuild/obstack.patch b/community/kbuild/obstack.patch
index 8301a427b03..9c2d0a31765 100644
--- a/community/kbuild/obstack.patch
+++ b/community/kbuild/obstack.patch
@@ -1,6 +1,8 @@
---- ./src/sed/Makefile.kmk.orig
-+++ ./src/sed/Makefile.kmk
-@@ -56,36 +56,30 @@
+diff --git a/src/sed/Makefile.kmk b/src/sed/Makefile.kmk
+index f34b3e8..1734c59 100644
+--- a/src/sed/Makefile.kmk
++++ b/src/sed/Makefile.kmk
+@@ -57,6 +57,7 @@ kmk_sed_SOURCES = \
sed/mbcs.c \
lib/getopt1.c \
lib/getopt.c \
@@ -8,35 +10,3 @@
lib/utils.c
kmk_sed_SOURCES.darwin = \
lib/strverscmp.c \
-- lib/obstack.c \
- lib/getline.c
- kmk_sed_SOURCES.dragonfly = \
- lib/strverscmp.c \
-- lib/obstack.c \
- lib/getline.c
- kmk_sed_SOURCES.freebsd = \
- lib/strverscmp.c \
-- lib/obstack.c \
- lib/getline.c
- kmk_sed_SOURCES.haiku = \
-- lib/strverscmp.c \
-- lib/obstack.c
-+ lib/strverscmp.c
- kmk_sed_SOURCES.openbsd = \
- lib/strverscmp.c \
-- lib/obstack.c \
- lib/getline.c
- kmk_sed_SOURCES.solaris = \
-- lib/strverscmp.c \
-- lib/obstack.c
-+ lib/strverscmp.c
- ifdef KBUILD_SOLARIS_10
- kmk_sed_SOURCES.solaris += \
- lib/getline.c
- endif
- kmk_sed_SOURCES.win = \
- lib/strverscmp.c \
-- lib/obstack.c \
- lib/mkstemp.c \
- lib/getline.c \
- ../lib/startuphacks-win.c
diff --git a/community/kbuild/os-linux.patch b/community/kbuild/os-linux.patch
new file mode 100644
index 00000000000..73d1320598b
--- /dev/null
+++ b/community/kbuild/os-linux.patch
@@ -0,0 +1,26 @@
+diff --git a/src/kmk/kmkbuiltin/fts.c b/src/kmk/kmkbuiltin/fts.c
+index cdf2209..040f836 100644
+--- a/src/kmk/kmkbuiltin/fts.c
++++ b/src/kmk/kmkbuiltin/fts.c
+@@ -76,7 +76,7 @@ __RCSID("$NetBSD: __fts13.c,v 1.44 2005/01/19 00:59:48 mycroft Exp $");
+ #endif
+
+ #if ! HAVE_NBTOOL_CONFIG_H
+-# if !defined(__sun__) && !defined(__gnu_linux__) && !defined(__HAIKU__)
++# if !defined(__sun__) && !defined(__linux__) && !defined(__HAIKU__)
+ # define HAVE_STRUCT_DIRENT_D_NAMLEN 1
+ # endif
+ #endif
+diff --git a/src/lib/kStuff/include/k/kDefs.h b/src/lib/kStuff/include/k/kDefs.h
+index fdaecb7..093b9b4 100644
+--- a/src/lib/kStuff/include/k/kDefs.h
++++ b/src/lib/kStuff/include/k/kDefs.h
+@@ -94,7 +94,7 @@
+ # define K_OS K_OS_GNU_KFBSD
+ # elif defined(__gnu_hurd__)
+ # define K_OS K_OS_GNU_HURD
+-# elif defined(__gnu_linux__)
++# elif defined(__linux__)
+ # define K_OS K_OS_LINUX
+ # elif defined(__NetBSD__) /*??*/
+ # define K_OS K_OS_NETBSD
diff --git a/community/kbuild/strlcpy.patch b/community/kbuild/strlcpy.patch
deleted file mode 100644
index d0b3a0471dc..00000000000
--- a/community/kbuild/strlcpy.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/kmk/kmkbuiltin/cp.c b/src/kmk/kmkbuiltin/cp.c
-index 44b76ab..85fec01 100644
---- a/src/kmk/kmkbuiltin/cp.c
-+++ b/src/kmk/kmkbuiltin/cp.c
-@@ -81,7 +81,7 @@ __FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.50 2004/04/06 20:06:44 markm Exp $");
- #include "kmkbuiltin.h"
- #include "kbuild_protection.h"
-
--#if defined(_MSC_VER) || defined(__gnu_linux__) || defined(__linux__)
-+#if defined(_MSC_VER) || defined(__gnu_linux__) && !defined(__UCLIBC__)
- extern char *strlcpy(char *, const char *, size_t);
- #endif
-
diff --git a/community/kbuild/sys_siglist.patch b/community/kbuild/sys_siglist.patch
index 140b8a0169e..aad33cc3c0e 100644
--- a/community/kbuild/sys_siglist.patch
+++ b/community/kbuild/sys_siglist.patch
@@ -1,18 +1,5 @@
diff --git a/src/ash/jobs.c b/src/ash/jobs.c
index 146326a..cbf0c3e 100644
---- a/src/ash/jobs.c
-+++ b/src/ash/jobs.c
-@@ -463,8 +463,8 @@ showjob(struct output *out, struct job *jp, int mode)
- #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)) {
--- ./src/kash/jobs.c.orig
+++ ./src/kash/jobs.c
@@ -396,8 +396,8 @@
diff --git a/community/kbuild/uclibc.patch b/community/kbuild/uclibc.patch
deleted file mode 100644
index f837ca3c782..00000000000
--- a/community/kbuild/uclibc.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- ./src/lib/k/kDefs.h.orig
-+++ ./src/lib/k/kDefs.h
-@@ -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(__linux__)
- # define K_OS K_OS_LINUX
- # elif defined(__NetBSD__) /*??*/
- # define K_OS K_OS_NETBSD
---- ./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__) && !defined(__HAIKU__)
-+# if !defined(__sun__) && !defined(__linux__) && !defined(__HAIKU__)
- # define HAVE_STRUCT_DIRENT_D_NAMLEN 1
- # endif
- #endif
generated by cgit v1.2.3 (git 2.41.0) at 2024-04-23 19:41:11 +0000