diff options
Diffstat (limited to 'dev-util/kbuild/files')
3 files changed, 90 insertions, 0 deletions
diff --git a/dev-util/kbuild/files/kbuild-0.1.9998.3407-glibc-2.32+.patch b/dev-util/kbuild/files/kbuild-0.1.9998.3407-glibc-2.32+.patch new file mode 100644 index 000000000000..68a39fc68deb --- /dev/null +++ b/dev-util/kbuild/files/kbuild-0.1.9998.3407-glibc-2.32+.patch @@ -0,0 +1,59 @@ +http://trac.netlabs.org/kbuild/changeset?format=diff&new=3408&old=3407&new_path=%2Ftrunk&old_path=%2Ftrunk + +--- a/src/kash/jobs.c ++++ b/src/kash/jobs.c +@@ -390,4 +390,5 @@ + fmtstr(s + col, 16, "Done"); + } else { ++ const char *pszSigNm; + #if JOBS + if (WIFSTOPPED(ps->status)) +@@ -397,6 +398,7 @@ + st = WTERMSIG(ps->status); + st &= 0x7f; +- if (st < NSIG && sys_siglist[st]) +- scopyn(sys_siglist[st], s + col, 32); ++ pszSigNm = st < NSIG ? strsignal(st) : NULL; ++ if (pszSigNm) ++ scopyn(pszSigNm, s + col, 32); + else + fmtstr(s + col, 16, "Signal %d", st); +--- a/src/kash/shinstance.h ++++ b/src/kash/shinstance.h +@@ -381,10 +381,6 @@ + /*# define SIGBREAK 21 */ + /*# define SIGABRT 22 */ +- +-# define sys_siglist sys_signame ++const char *strsignal(int iSig); + #endif /* _MSC_VER */ +-#ifdef __sun__ +-# define sys_siglist _sys_siglist +-#endif + #ifndef HAVE_SYS_SIGNAME + extern char sys_signame[NSIG][16]; +--- a/src/kash/sys_signame.c ++++ b/src/kash/sys_signame.c +@@ -12,5 +12,5 @@ + void init_sys_signame(void) + { +- unsigned i; ++ unsigned i; + if (sys_signame_initialized) + return; +@@ -120,2 +120,14 @@ + sys_signame_initialized = 1; + } ++ ++#if defined(_MSC_VER) ++const char *strsignal(int iSig) ++{ ++ if (!sys_signame_initialized) ++ init_sys_signame(); ++ if (iSig < NSIG) ++ return sys_signame(iSig); ++ return NULL; ++} ++#endif ++ + diff --git a/dev-util/kbuild/files/kbuild-0.1.9998.3407-gold.patch b/dev-util/kbuild/files/kbuild-0.1.9998.3407-gold.patch new file mode 100644 index 000000000000..14d5ec7cc422 --- /dev/null +++ b/dev-util/kbuild/files/kbuild-0.1.9998.3407-gold.patch @@ -0,0 +1,11 @@ +--- kbuild-0.1.9998.3407/src/kmk/Makefile.kmk ++++ kbuild-0.1.9998.3407/src/kmk/Makefile.kmk +@@ -60,7 +60,7 @@ + ifneq ($(KBUILD_TARGET),os2) + TEMPLATE_BIN-KMK_INCS += glob + endif +-TEMPLATE_BIN-KMK_LIBS = $(LIB_KUTIL) $(TEMPLATE_BIN-THREADED_LIBS) $(kmkmissing_1_TARGET) $(LIB_KUTIL) ++TEMPLATE_BIN-KMK_LIBS = $(LIB_KUTIL) $(TEMPLATE_BIN-THREADED_LIBS) $(kmkmissing_1_TARGET) $(LIB_KUTIL) pthread + ifdef ELECTRIC_HEAP # for electric heap (see electric.c). + ifeq ($(KBUILD_TARGET),win) + TEMPLATE_BIN-KMK_CFLAGS = $(TEMPLATE_BIN-THREADED_CFLAGS) /FI$(kmk_DEFPATH)/electric.h -DELECTRIC_HEAP=1 diff --git a/dev-util/kbuild/files/kbuild-0.1.9998.3407-unknown_configure_opt.patch b/dev-util/kbuild/files/kbuild-0.1.9998.3407-unknown_configure_opt.patch new file mode 100644 index 000000000000..2714716b7806 --- /dev/null +++ b/dev-util/kbuild/files/kbuild-0.1.9998.3407-unknown_configure_opt.patch @@ -0,0 +1,20 @@ +--- kbuild-0.1.9998.3407/bootstrap.gmk ++++ kbuild-0.1.9998.3407/bootstrap.gmk +@@ -151,7 +151,7 @@ + $(OUTDIR)/kmk/ts-configured: \ + $(OUTDIR)/kmk/ts-autoreconf \ + $(OUTDIR)/kmk/fts.h +- cd $(OUTDIR)/kmk && $(SRCDIR)/src/kmk/configure --disable-load --without-guile ++ cd $(OUTDIR)/kmk && $(SRCDIR)/src/kmk/configure --disable-load + echo done > $@ + + ifeq ($(KBUILD_HOST),solaris) +@@ -182,7 +182,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 |