diff options
Diffstat (limited to 'dev-build/kbuild/files')
10 files changed, 291 insertions, 0 deletions
diff --git a/dev-build/kbuild/files/kbuild-0.1.5-gentoo-docdir.patch b/dev-build/kbuild/files/kbuild-0.1.5-gentoo-docdir.patch new file mode 100644 index 00000000..b074a984 --- /dev/null +++ b/dev-build/kbuild/files/kbuild-0.1.5-gentoo-docdir.patch @@ -0,0 +1,11 @@ +--- a/Config.kmk ++++ b/Config.kmk +@@ -147,7 +147,7 @@ + MY_INST_DATA := $(MY_INST_ROOT)share/kBuild/ + endif + ifndef MY_INST_DOC +- MY_INST_DOC := $(MY_INST_ROOT)share/doc/kBuild-$(KBUILD_VERSION)/ ++ MY_INST_DOC := $(MY_INST_ROOT)share/doc/$(PF)/ + endif + if !defined(MY_INST_BIN_MODE) && defined(MY_INST_MODE) + MY_INST_BIN_MODE := $(MY_INST_MODE),a+x diff --git a/dev-build/kbuild/files/kbuild-0.1.9998_pre20110817-gcc-4.7.patch b/dev-build/kbuild/files/kbuild-0.1.9998_pre20110817-gcc-4.7.patch new file mode 100644 index 00000000..eb71fb02 --- /dev/null +++ b/dev-build/kbuild/files/kbuild-0.1.9998_pre20110817-gcc-4.7.patch @@ -0,0 +1,11 @@ +--- kBuild-0.1.9998-pre20110817/src/sed/lib/regex_internal.c ++++ kBuild-0.1.9998-pre20110817/src/sed/lib/regex_internal.c +@@ -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/dev-build/kbuild/files/kbuild-0.1.9998_pre20110817-gold.patch b/dev-build/kbuild/files/kbuild-0.1.9998_pre20110817-gold.patch new file mode 100644 index 00000000..8ad2ab32 --- /dev/null +++ b/dev-build/kbuild/files/kbuild-0.1.9998_pre20110817-gold.patch @@ -0,0 +1,16 @@ + src/kmk/Makefile.kmk | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/kmk/Makefile.kmk b/src/kmk/Makefile.kmk +index fe2cd43..135431e 100644 +--- a/src/kmk/Makefile.kmk ++++ b/src/kmk/Makefile.kmk +@@ -59,7 +59,7 @@ TEMPLATE_BIN-KMK_INCS.dragonfly = glob + TEMPLATE_BIN-KMK_INCS.freebsd = glob + TEMPLATE_BIN-KMK_INCS.openbsd = glob + TEMPLATE_BIN-KMK_INCS.solaris = glob +-TEMPLATE_BIN-KMK_LIBS = $(TEMPLATE_BIN-THREADED_LIBS) $(kmkmissing_1_TARGET) $(LIB_KUTIL) ++TEMPLATE_BIN-KMK_LIBS = $(TEMPLATE_BIN-THREADED_LIBS) $(kmkmissing_1_TARGET) $(LIB_KUTIL) pthread + ifdef ELECTRIC_HEAP # for electric heap (see electric.c) - windows only. + ifeq ($(KBUILD_TARGET),win) + TEMPLATE_BIN-KMK_CFLAGS = $(TEMPLATE_BIN-THREADED_CFLAGS) /FI$(kmk_DEFPATH)/electric.h -DELECTRIC_HEAP=1 diff --git a/dev-build/kbuild/files/kbuild-0.1.9998_pre20110817-kash-link-pthread.patch b/dev-build/kbuild/files/kbuild-0.1.9998_pre20110817-kash-link-pthread.patch new file mode 100644 index 00000000..d2b20176 --- /dev/null +++ b/dev-build/kbuild/files/kbuild-0.1.9998_pre20110817-kash-link-pthread.patch @@ -0,0 +1,10 @@ +--- kBuild-0.1.9998-pre20110817/src/kash/Makefile.kmk ++++ kBuild-0.1.9998-pre20110817/src/kash/Makefile.kmk +@@ -59,6 +59,7 @@ + if "$(USER)" == "bird" && "$(KBUILD_TARGET)" != "win" + kash_CFLAGS += -std=gnu99 + endif ++kash_LIBS += pthread + kash_CFLAGS.win.amd64 = -GS- + kash_SOURCES = \ + main.c \ diff --git a/dev-build/kbuild/files/kbuild-0.1.9998_pre20120806-qa.patch b/dev-build/kbuild/files/kbuild-0.1.9998_pre20120806-qa.patch new file mode 100644 index 00000000..9b0df420 --- /dev/null +++ b/dev-build/kbuild/files/kbuild-0.1.9998_pre20120806-qa.patch @@ -0,0 +1,13 @@ +--- kBuild-0.1.9998-pre20120806/src/sed/lib/utils.c ++++ kBuild-0.1.9998-pre20120806/src/sed/lib/utils.c +@@ -35,6 +35,10 @@ + # include <stdlib.h> + #endif /* HAVE_STDLIB_H */ + ++#ifdef HAVE_UNISTD_H ++# include <unistd.h> ++#endif /* HAVE_UNISTD_H */ ++ + #include "utils.h" + + const char *myname; diff --git a/dev-build/kbuild/files/kbuild-glibc-2.10.patch b/dev-build/kbuild/files/kbuild-glibc-2.10.patch new file mode 100644 index 00000000..d24a8f74 --- /dev/null +++ b/dev-build/kbuild/files/kbuild-glibc-2.10.patch @@ -0,0 +1,31 @@ +--- kBuild-0.1.5/src/ash/output.c ++++ kBuild-0.1.5/src/ash/output.c +@@ -230,6 +230,7 @@ + va_end(ap); + } + ++#if 0 + void + dprintf(const char *fmt, ...) + { +@@ -240,6 +241,7 @@ + va_end(ap); + flushout(out2); + } ++#endif + + void + fmtstr(char *outbuf, size_t length, const char *fmt, ...) +--- kBuild-0.1.5/src/ash/output.h ++++ kBuild-0.1.5/src/ash/output.h +@@ -65,8 +65,10 @@ + __attribute__((__format__(__printf__,2,3))); + void out1fmt(const char *, ...) + __attribute__((__format__(__printf__,1,2))); ++#if 0 + void dprintf(const char *, ...) + __attribute__((__format__(__printf__,1,2))); ++#endif + void fmtstr(char *, size_t, const char *, ...) + __attribute__((__format__(__printf__,3,4))); + void doformat(struct output *, const char *, va_list); diff --git a/dev-build/kbuild/files/kbuild-missing-headers.patch b/dev-build/kbuild/files/kbuild-missing-headers.patch new file mode 100644 index 00000000..11398605 --- /dev/null +++ b/dev-build/kbuild/files/kbuild-missing-headers.patch @@ -0,0 +1,23 @@ +diff -Naur kBuild-0.1.9998-pre20131130.orig/src/kObjCache/kObjCache.c kBuild-0.1.9998-pre20131130/src/kObjCache/kObjCache.c +--- kBuild-0.1.9998-pre20131130.orig/src/kObjCache/kObjCache.c 2016-11-16 12:43:46.303891466 -0800 ++++ kBuild-0.1.9998-pre20131130/src/kObjCache/kObjCache.c 2016-11-16 12:48:21.106674374 -0800 +@@ -38,6 +38,7 @@ + #include <errno.h> + #include <assert.h> + #include <sys/stat.h> ++#include <sys/file.h> + #include <fcntl.h> + #include <limits.h> + #include <ctype.h> +diff -Naur kBuild-0.1.9998-pre20131130.orig/src/kmk/kmkbuiltin/ftsfake.h kBuild-0.1.9998-pre20131130/src/kmk/kmkbuiltin/ftsfake.h +--- kBuild-0.1.9998-pre20131130.orig/src/kmk/kmkbuiltin/ftsfake.h 2016-11-16 12:43:46.362892063 -0800 ++++ kBuild-0.1.9998-pre20131130/src/kmk/kmkbuiltin/ftsfake.h 2016-11-16 12:48:39.365859284 -0800 +@@ -34,6 +34,8 @@ + #ifndef _FTS_H_ + #define _FTS_H_ + ++#include <sys/types.h> ++ + #ifdef _MSC_VER + # include "kmkbuiltin/mscfakes.h" + #endif diff --git a/dev-build/kbuild/files/kbuild-musl.patch b/dev-build/kbuild/files/kbuild-musl.patch new file mode 100644 index 00000000..04495b45 --- /dev/null +++ b/dev-build/kbuild/files/kbuild-musl.patch @@ -0,0 +1,66 @@ +diff -Naur kBuild-0.1.9998-pre20131130.orig/src/ash/jobs.c kBuild-0.1.9998-pre20131130/src/ash/jobs.c +--- kBuild-0.1.9998-pre20131130.orig/src/ash/jobs.c 2016-11-16 12:43:46.369892134 -0800 ++++ kBuild-0.1.9998-pre20131130/src/ash/jobs.c 2016-11-16 13:00:43.891220488 -0800 +@@ -46,9 +46,6 @@ + #endif /* not lint */ + + #include <fcntl.h> +-#ifdef __sun__ +-#define sys_siglist _sys_siglist +-#endif + #include <signal.h> + #include <errno.h> + #include <unistd.h> +@@ -463,8 +460,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 -Naur kBuild-0.1.9998-pre20131130.orig/src/kash/jobs.c kBuild-0.1.9998-pre20131130/src/kash/jobs.c +--- kBuild-0.1.9998-pre20131130.orig/src/kash/jobs.c 2016-11-16 12:43:46.309891526 -0800 ++++ kBuild-0.1.9998-pre20131130/src/kash/jobs.c 2016-11-16 13:00:43.892220498 -0800 +@@ -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 -Naur kBuild-0.1.9998-pre20131130.orig/src/kmk/kmkbuiltin/chmod.c kBuild-0.1.9998-pre20131130/src/kmk/kmkbuiltin/chmod.c +--- kBuild-0.1.9998-pre20131130.orig/src/kmk/kmkbuiltin/chmod.c 2016-11-16 12:43:46.360892043 -0800 ++++ kBuild-0.1.9998-pre20131130/src/kmk/kmkbuiltin/chmod.c 2016-11-16 13:00:48.929272615 -0800 +@@ -66,6 +66,10 @@ + #include "getopt.h" + #include "kmkbuiltin.h" + ++#if !defined(ALLPERMS) ++# define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO) /* 07777 */ ++#endif ++ + extern void * bsd_setmode(const char *p); + extern mode_t bsd_getmode(const void *bbox, mode_t omode); + extern void bsd_strmode(mode_t mode, char *p); +diff -Naur kBuild-0.1.9998-pre20131130.orig/src/kmk/kmkbuiltin/install.c kBuild-0.1.9998-pre20131130/src/kmk/kmkbuiltin/install.c +--- kBuild-0.1.9998-pre20131130.orig/src/kmk/kmkbuiltin/install.c 2016-11-16 12:43:46.362892063 -0800 ++++ kBuild-0.1.9998-pre20131130/src/kmk/kmkbuiltin/install.c 2016-11-16 13:00:48.929272615 -0800 +@@ -127,6 +127,10 @@ + # define IS_SLASH(ch) ((ch) == '/') + #endif + ++#if !defined(ALLPERMS) ++# define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO) /* 07777 */ ++#endif ++ + static gid_t gid; + static uid_t uid; + static int dobackup, docompare, dodir, dopreserve, dostrip, nommap, safecopy, verbose, mode_given; diff --git a/dev-build/kbuild/files/kbuild-non-glibc.patch b/dev-build/kbuild/files/kbuild-non-glibc.patch new file mode 100644 index 00000000..834241a7 --- /dev/null +++ b/dev-build/kbuild/files/kbuild-non-glibc.patch @@ -0,0 +1,99 @@ +diff -Naur kBuild-0.1.9998-pre20131130.orig/src/kmk/Makefile.kmk kBuild-0.1.9998-pre20131130/src/kmk/Makefile.kmk +--- kBuild-0.1.9998-pre20131130.orig/src/kmk/Makefile.kmk 2016-11-16 12:43:46.365892093 -0800 ++++ kBuild-0.1.9998-pre20131130/src/kmk/Makefile.kmk 2016-11-16 12:51:37.071658898 -0800 +@@ -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) pthread + 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 + + kmkmissing_SOURCES.openbsd = \ + kmkbuiltin/openbsd.c \ +diff -Naur kBuild-0.1.9998-pre20131130.orig/src/kmk/kmkbuiltin/cp.c kBuild-0.1.9998-pre20131130/src/kmk/kmkbuiltin/cp.c +--- kBuild-0.1.9998-pre20131130.orig/src/kmk/kmkbuiltin/cp.c 2016-11-16 12:43:46.359892033 -0800 ++++ kBuild-0.1.9998-pre20131130/src/kmk/kmkbuiltin/cp.c 2016-11-16 12:51:37.071658898 -0800 +@@ -81,7 +81,7 @@ + #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 -Naur kBuild-0.1.9998-pre20131130.orig/src/kmk/kmkbuiltin/fts.c kBuild-0.1.9998-pre20131130/src/kmk/kmkbuiltin/fts.c +--- kBuild-0.1.9998-pre20131130.orig/src/kmk/kmkbuiltin/fts.c 2016-11-16 12:43:46.362892063 -0800 ++++ kBuild-0.1.9998-pre20131130/src/kmk/kmkbuiltin/fts.c 2016-11-16 12:51:37.072658908 -0800 +@@ -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 +diff -Naur kBuild-0.1.9998-pre20131130.orig/src/lib/k/kDefs.h kBuild-0.1.9998-pre20131130/src/lib/k/kDefs.h +--- kBuild-0.1.9998-pre20131130.orig/src/lib/k/kDefs.h 2016-11-16 12:43:46.434892792 -0800 ++++ kBuild-0.1.9998-pre20131130/src/lib/k/kDefs.h 2016-11-16 12:51:37.073658918 -0800 +@@ -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 +diff -Naur kBuild-0.1.9998-pre20131130.orig/src/sed/Makefile.kmk kBuild-0.1.9998-pre20131130/src/sed/Makefile.kmk +--- kBuild-0.1.9998-pre20131130.orig/src/sed/Makefile.kmk 2016-11-16 12:43:46.384892286 -0800 ++++ kBuild-0.1.9998-pre20131130/src/sed/Makefile.kmk 2016-11-16 12:53:02.704528817 -0800 +@@ -56,36 +56,30 @@ + sed/mbcs.c \ + lib/getopt1.c \ + lib/getopt.c \ ++ lib/obstack.c \ + 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/dev-build/kbuild/files/kbuild-unknown-configure-opt.patch b/dev-build/kbuild/files/kbuild-unknown-configure-opt.patch new file mode 100644 index 00000000..36cabae2 --- /dev/null +++ b/dev-build/kbuild/files/kbuild-unknown-configure-opt.patch @@ -0,0 +1,11 @@ +--- a/bootstrap.gmk ++++ b/bootstrap.gmk +@@ -179,7 +179,7 @@ + echo done > $@ + + $(OUTDIR)/sed/ts-configured: $(OUTDIR)/sed/ts-autoreconf +- cd $(OUTDIR)/sed && $(SRCDIR)/src/sed/configure --without-libintl --disable-nls ++ cd $(OUTDIR)/sed && $(SRCDIR)/src/sed/configure --disable-nls + echo done > $@ + + $(OUTDIR)/sed/config.h: $(OUTDIR)/sed/ts-configured |