jengelh/kbuild
SHA256
1
0
Fork 0
forked from pool/kbuild
Code Pull Requests Activity

- update to svn3427

Browse Source 
- remove patches:
  gcc10-fno-common-fix.patch, glob-interface.patch,
  use-alloca.patch, kbuild-gcc7.patch, kbuild-glob.patch, 
  strsignal.patch: upstream or obsolete

OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/kbuild?expand=0&rev=50
This commit is contained in:
Dirk Mueller 2020-08-31 18:48:16 +00:00 committed by Git OBS Bridge
parent e7a8940de2
commit f0e6f6aa1a
14 changed files with 57 additions and 337 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
aarch64.patch
View File

@ -1,8 +1,8 @@
Index: kbuild-0.1.9998svn3110/kBuild/env.sh Index: kbuild-0.1.9998svn3427/kBuild/env.sh
=================================================================== ===================================================================
--- kbuild-0.1.9998svn3110.orig/kBuild/env.sh --- kbuild-0.1.9998svn3427.orig/kBuild/env.sh
+++ kbuild-0.1.9998svn3110/kBuild/env.sh +++ kbuild-0.1.9998svn3427/kBuild/env.sh
@@ -395,6 +395,9 @@ if test -z "$KBUILD_HOST_ARCH"; then @@ -413,6 +413,9 @@ if test -z "$KBUILD_HOST_ARCH"; then
sparc64|sparcv9) sparc64|sparcv9)
KBUILD_HOST_ARCH='sparc64' KBUILD_HOST_ARCH='sparc64'
;; ;;
@ -12,26 +12,26 @@ Index: kbuild-0.1.9998svn3110/kBuild/env.sh
*) echo "$0: unknown cpu/arch - $KBUILD_HOST_ARCH" 1>&${ERR_REDIR} *) echo "$0: unknown cpu/arch - $KBUILD_HOST_ARCH" 1>&${ERR_REDIR}
sleep 1 sleep 1
Index: kbuild-0.1.9998svn3110/kBuild/header.kmk Index: kbuild-0.1.9998svn3427/kBuild/header.kmk
=================================================================== ===================================================================
--- kbuild-0.1.9998svn3110.orig/kBuild/header.kmk --- kbuild-0.1.9998svn3427.orig/kBuild/header.kmk
+++ kbuild-0.1.9998svn3110/kBuild/header.kmk +++ kbuild-0.1.9998svn3427/kBuild/header.kmk
@@ -197,8 +197,8 @@ KBUILD_BLD_TYPES := release profile debu @@ -197,8 +197,8 @@ KBUILD_BLD_TYPES := release profile debu
# build types. (PORTME) # build types. (PORTME)
# #
KBUILD_OSES := darwin dos dragonfly freebsd gnuhurd gnukfbsd gnuknbsd haiku l4 linux netbsd nt openbsd os2 solaris win os-agnostic KBUILD_OSES := darwin dos dragonfly freebsd gnuhurd gnukfbsd gnuknbsd haiku l4 linux netbsd nt openbsd os2 solaris win os-agnostic
-KBUILD_ARCHES := x86 amd64 noarch alpha arm32 arm64 hppa32 hppa64 ia64 m68k ppc64le mips32 mips64 ppc32 ppc64 s390 s390x sh32 sh64 sparc32 sparc64 -KBUILD_ARCHES := x86 amd64 noarch alpha arm32 arm64 hppa32 hppa64 ia64 m68k mips32 mips64 ppc32 ppc64 ppc64le s390 s390x sh32 sh64 sparc32 sparc64 x32
-KBUILD_ARCHES_64 := amd64 alpha arm64 hppa64 ia64 ppc64le mips64 ppc64 s390x sh64 sparc64 -KBUILD_ARCHES_64 := amd64 alpha arm64 hppa64 ia64 mips64 ppc64 ppc64le s390x sh64 sparc64 x32
+KBUILD_ARCHES := x86 amd64 noarch alpha arm32 arm64 hppa32 hppa64 ia64 m68k ppc64le mips32 mips64 ppc32 ppc64 s390 s390x aarch64 sh32 sh64 sparc32 sparc64 +KBUILD_ARCHES := x86 amd64 noarch alpha arm32 arm64 aarch64 hppa32 hppa64 ia64 m68k mips32 mips64 ppc32 ppc64 ppc64le s390 s390x sh32 sh64 sparc32 sparc64 x32
+KBUILD_ARCHES_64 := amd64 alpha arm64 hppa64 ia64 ppc64le mips64 ppc64 s390x aarch64 sh64 sparc64 +KBUILD_ARCHES_64 := amd64 alpha arm64 aarch64 hppa64 ia64 mips64 ppc64 ppc64le s390x sh64 sparc64 x32
KBUILD_ARCHES_32 := x86 arm32 hppa32 m68k mips32 ppc32 s390 sh32 sparc32 KBUILD_ARCHES_32 := x86 arm32 hppa32 m68k mips32 ppc32 s390 sh32 sparc32
Index: kbuild-0.1.9998svn3110/src/lib/kStuff/include/k/kDefs.h Index: kbuild-0.1.9998svn3427/src/lib/kStuff/include/k/kDefs.h
=================================================================== ===================================================================
--- kbuild-0.1.9998svn3110.orig/src/lib/kStuff/include/k/kDefs.h --- kbuild-0.1.9998svn3427.orig/src/lib/kStuff/include/k/kDefs.h
+++ kbuild-0.1.9998svn3110/src/lib/kStuff/include/k/kDefs.h +++ kbuild-0.1.9998svn3427/src/lib/kStuff/include/k/kDefs.h
@@ -160,6 +160,8 @@ @@ -164,6 +164,8 @@
#define K_ARCH_ARM_64 ( 5 | K_ARCH_BIT_64 | K_ARCH_END_BI) #define K_ARCH_ARM_64 ( 5 | K_ARCH_BIT_64 | K_ARCH_END_BI)
/** Motorola 68000 (32-bit). */ /** Motorola 68000 (32-bit). */
#define K_ARCH_M68K ( 6 | K_ARCH_BIT_32 | K_ARCH_END_BIG) #define K_ARCH_M68K ( 6 | K_ARCH_BIT_32 | K_ARCH_END_BIG)
@ -40,7 +40,7 @@ Index: kbuild-0.1.9998svn3110/src/lib/kStuff/include/k/kDefs.h
/** 32-bit MIPS. */ /** 32-bit MIPS. */
#define K_ARCH_MIPS_32 ( 7 | K_ARCH_BIT_32 | K_ARCH_END_BI) #define K_ARCH_MIPS_32 ( 7 | K_ARCH_BIT_32 | K_ARCH_END_BI)
/** 64-bit MIPS. */ /** 64-bit MIPS. */
@@ -206,8 +208,10 @@ @@ -210,8 +212,10 @@
# define K_ARCH K_ARCH_ALPHA # define K_ARCH K_ARCH_ALPHA
# elif defined(__arm__) || defined(__arm32__) # elif defined(__arm__) || defined(__arm32__)
# define K_ARCH K_ARCH_ARM_32 # define K_ARCH K_ARCH_ARM_32

13
gcc10-fno-common-fix.patch
View File

@ -1,13 +0,0 @@
diff --git a/src/kmk/make.h b/src/kmk/make.h
index 982cd0c..aa64452 100644
--- a/src/kmk/make.h
+++ b/src/kmk/make.h
@@ -472,7 +472,7 @@ extern int unixy_shell;
#endif
#ifdef SET_STACK_SIZE
# include <sys/resource.h>
-struct rlimit stack_limit;
+extern struct rlimit stack_limit;
#endif
struct floc

16
glob-interface.patch
View File

@ -1,16 +0,0 @@
Index: kbuild-0.1.9998svn3110/src/kmk/configure.in
===================================================================
--- kbuild-0.1.9998svn3110.orig/src/kmk/configure.in
+++ kbuild-0.1.9998svn3110/src/kmk/configure.in
@@ -360,10 +360,9 @@ AC_CACHE_VAL(make_cv_sys_gnu_glob, [
#include <glob.h>
#include <fnmatch.h>
-#define GLOB_INTERFACE_VERSION 1
#if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1
# include <gnu-versions.h>
-# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION
+# if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2
gnu glob
# endif
#endif

12
glob-lstat.patch
View File

@ -15,11 +15,11 @@ requires.
dir.c | 29 +++++++++++++++++++++++++++-- dir.c | 29 +++++++++++++++++++++++++++--
1 file changed, 27 insertions(+), 2 deletions(-) 1 file changed, 27 insertions(+), 2 deletions(-)
Index: kbuild-0.1.9998svn3110/src/kmk/dir.c Index: kbuild-0.1.9998svn3427/src/kmk/dir.c
=================================================================== ===================================================================
--- kbuild-0.1.9998svn3110.orig/src/kmk/dir.c --- kbuild-0.1.9998svn3427.orig/src/kmk/dir.c
+++ kbuild-0.1.9998svn3110/src/kmk/dir.c +++ kbuild-0.1.9998svn3427/src/kmk/dir.c
@@ -1465,6 +1465,32 @@ static int dir_exists_p (const char *dir @@ -1559,6 +1559,32 @@ static int dir_exists_p (const char *dir
} }
#endif #endif
@ -52,9 +52,9 @@ Index: kbuild-0.1.9998svn3110/src/kmk/dir.c
void void
dir_setup_glob (glob_t *gl) dir_setup_glob (glob_t *gl)
{ {
@@ -1472,15 +1498,11 @@ dir_setup_glob (glob_t *gl) @@ -1566,15 +1592,11 @@ dir_setup_glob (glob_t *gl)
gl->gl_readdir = read_dirstream; gl->gl_readdir = read_dirstream;
gl->gl_closedir = ansi_free; gl->gl_closedir = free;
gl->gl_stat = local_stat; gl->gl_stat = local_stat;
-#ifdef __EMX__ /* The FreeBSD implementation actually uses gl_lstat!! */ -#ifdef __EMX__ /* The FreeBSD implementation actually uses gl_lstat!! */
- gl->gl_lstat = local_stat; - gl->gl_lstat = local_stat;

3
kbuild-0.1.9998svn3110.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:dda4308a1c5b2f65ccf949d3877ef5249c3b3e184feb5427def8f4b6ee74e807
size 33183482

3
kbuild-0.1.9998svn3427.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:42bf7a384cd8580f971d29ddd48d6b771e5f53c97ee9d9a73b607610ecb0d80d
size 2807755

4
kbuild-dummy_noreturn.diff
View File

@ -2,10 +2,10 @@ Index: src/kmk/kmkbuiltin/expr.c
=================================================================== ===================================================================
--- src/kmk/kmkbuiltin/expr.c.orig --- src/kmk/kmkbuiltin/expr.c.orig
+++ src/kmk/kmkbuiltin/expr.c +++ src/kmk/kmkbuiltin/expr.c
@@ -311,6 +311,8 @@ eval6(void) @@ -317,6 +317,8 @@ eval6(PEXPRINSTANCE pThis)
return v; return v;
} else { } else {
error(); error(pThis);
+ /* dummy return in order to make the build checks happy (this will never be reached) */ + /* dummy return in order to make the build checks happy (this will never be reached) */
+ return NULL; + return NULL;
} }

0
kbuild-gcc7.patch
View File

23
kbuild-glob.patch
View File

@ -1,23 +0,0 @@
---
---
src/kmk/dir.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Index: kbuild-0.1.9998svn3110/src/kmk/dir.c
===================================================================
--- kbuild-0.1.9998svn3110.orig/src/kmk/dir.c
+++ kbuild-0.1.9998svn3110/src/kmk/dir.c
@@ -1340,8 +1340,11 @@ void print_dir_stats (void)
/* Hooks for globbing. */
+#if defined(KMK) && !defined(__GLIBC__)
+# include "glob/glob.h"
+#else
#include <glob.h>
-
+#endif
/* Structure describing state of iterating through a directory hash table. */
struct dirstream

9
kbuild.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Mon Aug 31 18:46:37 UTC 2020 - Dirk Mueller <dmueller@suse.com>
- update to svn3427
- remove patches:
gcc10-fno-common-fix.patch, glob-interface.patch,
use-alloca.patch, kbuild-gcc7.patch, kbuild-glob.patch,
strsignal.patch: upstream or obsolete
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Aug 31 14:25:14 UTC 2020 - Andreas Schwab <schwab@suse.de> Mon Aug 31 14:25:14 UTC 2020 - Andreas Schwab <schwab@suse.de>

17
kbuild.spec
View File

@ -16,7 +16,7 @@
# #
%define _svnrev 3110 %define _svnrev 3427
Name: kbuild Name: kbuild
Version: 0.1.9998svn%{_svnrev} Version: 0.1.9998svn%{_svnrev}
Release: 0 Release: 0
@ -26,8 +26,6 @@ Group: Development/Tools/Building
URL: https://svn.netlabs.org/kbuild URL: https://svn.netlabs.org/kbuild
Source0: %{name}-%{version}.tar.bz2 Source0: %{name}-%{version}.tar.bz2
Patch0: kbuild-man.diff Patch0: kbuild-man.diff
# PATCH-FIX-UPSTREAM speilicke@suse.com: Import local implementation if KMK
Patch1: kbuild-glob.patch
Patch2: kbuild-dummy_noreturn.diff Patch2: kbuild-dummy_noreturn.diff
Patch5: kbuild-pthread.diff Patch5: kbuild-pthread.diff
Patch6: kbuild-timestamps.diff Patch6: kbuild-timestamps.diff
@ -35,12 +33,7 @@ Patch7: kbuild-armv7l.diff
Patch8: kbuild-wrong-memset.patch Patch8: kbuild-wrong-memset.patch
Patch9: ppc64le.patch Patch9: ppc64le.patch
Patch10: aarch64.patch Patch10: aarch64.patch
Patch11: kbuild-gcc7.patch
Patch12: use-alloca.patch
Patch13: glob-lstat.patch Patch13: glob-lstat.patch
Patch14: glob-interface.patch
Patch15: gcc10-fno-common-fix.patch
Patch16: strsignal.patch
BuildRequires: automake BuildRequires: automake
BuildRequires: bison BuildRequires: bison
BuildRequires: flex BuildRequires: flex
@ -64,7 +57,6 @@ The goals of the kBuild framework:
%prep %prep
%setup -q %setup -q
%patch0 %patch0
%patch1 -p1
%patch2 %patch2
%patch5 -p1 %patch5 -p1
%patch6 -p1 %patch6 -p1
@ -72,15 +64,10 @@ The goals of the kBuild framework:
%patch8 -p1 %patch8 -p1
%patch9 -p1 %patch9 -p1
%patch10 -p1 %patch10 -p1
%patch11 -p1
%patch12
%patch13 -p1 %patch13 -p1
%patch14 -p1
%patch15 -p1
%patch16
%build %build
export CFLAGS="%{optflags}" export CFLAGS="%{optflags} -fno-strict-aliasing"
cat > SvnInfo.kmk << EOF cat > SvnInfo.kmk << EOF
KBUILD_SVN_REV := %{_svnrev} KBUILD_SVN_REV := %{_svnrev}
KBUILD_SVN_URL := http://svn.netlabs.org/repos/kbuild/trunk KBUILD_SVN_URL := http://svn.netlabs.org/repos/kbuild/trunk

34
ppc64le.patch
View File

@ -4,11 +4,11 @@
src/lib/k/kDefs.h | 16 ++++++++++------ src/lib/k/kDefs.h | 16 ++++++++++------
3 files changed, 16 insertions(+), 9 deletions(-) 3 files changed, 16 insertions(+), 9 deletions(-)
Index: kbuild-0.1.9998svn3110/kBuild/env.sh Index: kbuild-0.1.9998svn3427/kBuild/env.sh
=================================================================== ===================================================================
--- kbuild-0.1.9998svn3110.orig/kBuild/env.sh --- kbuild-0.1.9998svn3427.orig/kBuild/env.sh
+++ kbuild-0.1.9998svn3110/kBuild/env.sh +++ kbuild-0.1.9998svn3427/kBuild/env.sh
@@ -368,6 +368,9 @@ if test -z "$KBUILD_HOST_ARCH"; then @@ -386,6 +386,9 @@ if test -z "$KBUILD_HOST_ARCH"; then
m68k) m68k)
KBUILD_HOST_ARCH='m68k' KBUILD_HOST_ARCH='m68k'
;; ;;
@ -18,22 +18,22 @@ Index: kbuild-0.1.9998svn3110/kBuild/env.sh
mips32|mips) mips32|mips)
KBUILD_HOST_ARCH='mips32' KBUILD_HOST_ARCH='mips32'
;; ;;
Index: kbuild-0.1.9998svn3110/kBuild/header.kmk Index: kbuild-0.1.9998svn3427/kBuild/header.kmk
=================================================================== ===================================================================
--- kbuild-0.1.9998svn3110.orig/kBuild/header.kmk --- kbuild-0.1.9998svn3427.orig/kBuild/header.kmk
+++ kbuild-0.1.9998svn3110/kBuild/header.kmk +++ kbuild-0.1.9998svn3427/kBuild/header.kmk
@@ -197,8 +197,8 @@ KBUILD_BLD_TYPES := release profile debu @@ -197,8 +197,8 @@ KBUILD_BLD_TYPES := release profile debu
# build types. (PORTME) # build types. (PORTME)
# #
KBUILD_OSES := darwin dos dragonfly freebsd gnuhurd gnukfbsd gnuknbsd haiku l4 linux netbsd nt openbsd os2 solaris win os-agnostic KBUILD_OSES := darwin dos dragonfly freebsd gnuhurd gnukfbsd gnuknbsd haiku l4 linux netbsd nt openbsd os2 solaris win os-agnostic
-KBUILD_ARCHES := x86 amd64 noarch alpha arm32 arm64 hppa32 hppa64 ia64 m68k mips32 mips64 ppc32 ppc64 s390 s390x sh32 sh64 sparc32 sparc64 -KBUILD_ARCHES := x86 amd64 noarch alpha arm32 arm64 hppa32 hppa64 ia64 m68k mips32 mips64 ppc32 ppc64 s390 s390x sh32 sh64 sparc32 sparc64 x32
-KBUILD_ARCHES_64 := amd64 alpha arm64 hppa64 ia64 mips64 ppc64 s390x sh64 sparc64 -KBUILD_ARCHES_64 := amd64 alpha arm64 hppa64 ia64 mips64 ppc64 s390x sh64 sparc64 x32
+KBUILD_ARCHES := x86 amd64 noarch alpha arm32 arm64 hppa32 hppa64 ia64 m68k ppc64le mips32 mips64 ppc32 ppc64 s390 s390x sh32 sh64 sparc32 sparc64 +KBUILD_ARCHES := x86 amd64 noarch alpha arm32 arm64 hppa32 hppa64 ia64 m68k mips32 mips64 ppc32 ppc64 ppc64le s390 s390x sh32 sh64 sparc32 sparc64 x32
+KBUILD_ARCHES_64 := amd64 alpha arm64 hppa64 ia64 ppc64le mips64 ppc64 s390x sh64 sparc64 +KBUILD_ARCHES_64 := amd64 alpha arm64 hppa64 ia64 mips64 ppc64 ppc64le s390x sh64 sparc64 x32
KBUILD_ARCHES_32 := x86 arm32 hppa32 m68k mips32 ppc32 s390 sh32 sparc32 KBUILD_ARCHES_32 := x86 arm32 hppa32 m68k mips32 ppc32 s390 sh32 sparc32
@@ -515,7 +515,7 @@ endif @@ -522,7 +522,7 @@ endif
KBUILD_DEVTOOLS_TRG ?= $(KBUILD_DEVTOOLS)/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH) KBUILD_DEVTOOLS_TRG ?= $(KBUILD_DEVTOOLS)/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)
KBUILD_DEVTOOLS_HST ?= $(KBUILD_DEVTOOLS)/$(KBUILD_HOST).$(KBUILD_HOST_ARCH) KBUILD_DEVTOOLS_HST ?= $(KBUILD_DEVTOOLS)/$(KBUILD_HOST).$(KBUILD_HOST_ARCH)
@ -42,11 +42,11 @@ Index: kbuild-0.1.9998svn3110/kBuild/header.kmk
ifeq ($(KBUILD_TARGET_ARCH),amd64) ifeq ($(KBUILD_TARGET_ARCH),amd64)
KBUILD_DEVTOOLS_TRG_ALT ?= $(KBUILD_DEVTOOLS)/$(KBUILD_TARGET).x86 KBUILD_DEVTOOLS_TRG_ALT ?= $(KBUILD_DEVTOOLS)/$(KBUILD_TARGET).x86
else ifeq ($(KBUILD_TARGET_ARCH),hppa64) else ifeq ($(KBUILD_TARGET_ARCH),hppa64)
Index: kbuild-0.1.9998svn3110/src/lib/kStuff/include/k/kDefs.h Index: kbuild-0.1.9998svn3427/src/lib/kStuff/include/k/kDefs.h
=================================================================== ===================================================================
--- kbuild-0.1.9998svn3110.orig/src/lib/kStuff/include/k/kDefs.h --- kbuild-0.1.9998svn3427.orig/src/lib/kStuff/include/k/kDefs.h
+++ kbuild-0.1.9998svn3110/src/lib/kStuff/include/k/kDefs.h +++ kbuild-0.1.9998svn3427/src/lib/kStuff/include/k/kDefs.h
@@ -172,20 +172,22 @@ @@ -176,20 +176,22 @@
#define K_ARCH_POWERPC_32 ( 9 | K_ARCH_BIT_32 | K_ARCH_END_BI) #define K_ARCH_POWERPC_32 ( 9 | K_ARCH_BIT_32 | K_ARCH_END_BI)
/** 64-bit PowerPC. */ /** 64-bit PowerPC. */
#define K_ARCH_POWERPC_64 ( 9 | K_ARCH_BIT_64 | K_ARCH_END_BI) #define K_ARCH_POWERPC_64 ( 9 | K_ARCH_BIT_64 | K_ARCH_END_BI)
@ -74,7 +74,7 @@ Index: kbuild-0.1.9998svn3110/src/lib/kStuff/include/k/kDefs.h
/** @} */ /** @} */
@@ -216,8 +218,10 @@ @@ -220,8 +222,10 @@
# define K_ARCH K_ARCH_MIPS_64 # define K_ARCH K_ARCH_MIPS_64
# elif defined(__mips__) # elif defined(__mips__)
# define K_ARCH K_ARCH_MIPS_32 # define K_ARCH K_ARCH_MIPS_32

76
strsignal.patch
View File

@ -1,76 +0,0 @@
------------------------------------------------------------------------
r3408 | bird | 2020-08-13 11:01:14 +0200 (Do, 13 Aug 2020) | 1 line
kash: Don't use sys_siglist, use strsignal instead. Should be present everywhere except when using VC++ on windows.
------------------------------------------------------------------------
Index: src/kash/jobs.c
===================================================================
--- src/kash/jobs.c (revision 3407)
+++ src/kash/jobs.c (revision 3408)
@@ -389,6 +389,7 @@
else
fmtstr(s + col, 16, "Done");
} else {
+ const char *pszSigNm;
#if JOBS
if (WIFSTOPPED(ps->status))
st = WSTOPSIG(ps->status);
@@ -396,8 +397,9 @@
#endif
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);
if (WCOREDUMP(ps->status)) {
Index: src/kash/shinstance.h
===================================================================
--- src/kash/shinstance.h (revision 3407)
+++ src/kash/shinstance.h (revision 3408)
@@ -380,12 +380,8 @@
# define SIGCONT 20
/*# 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];
#endif
Index: src/kash/sys_signame.c
===================================================================
--- src/kash/sys_signame.c (revision 3407)
+++ src/kash/sys_signame.c (revision 3408)
@@ -11,7 +11,7 @@
void init_sys_signame(void)
{
- unsigned i;
+ unsigned i;
if (sys_signame_initialized)
return;
for (i = 0; i < NSIG; ++i)
@@ -119,3 +119,15 @@
#undef SET_SIG_STR
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
+

148
use-alloca.patch
View File

@ -1,148 +0,0 @@
--- src/kmk/glob/glob.c.orig 2018-02-20 10:56:04.477559710 +0100
+++ src/kmk/glob/glob.c 2018-02-20 10:56:51.498370508 +0100
@@ -209,8 +209,7 @@
#endif /* __GNU_LIBRARY__ || __DJGPP__ */
-#if !defined __alloca && !defined __GNU_LIBRARY__
-
+#if !defined alloca
# ifdef __GNUC__
# undef alloca
# define alloca(n) __builtin_alloca (n)
@@ -227,9 +226,6 @@
# endif /* Not _AIX. */
# endif /* sparc or HAVE_ALLOCA_H. */
# endif /* GCC. */
-
-# define __alloca alloca
-
#endif
#ifndef __GNU_LIBRARY__
@@ -558,7 +554,7 @@
char *drive_spec;
++dirlen;
- drive_spec = (char *) __alloca (dirlen + 1);
+ drive_spec = (char *) alloca (dirlen + 1);
#ifdef HAVE_MEMPCPY
*((char *) mempcpy (drive_spec, pattern, dirlen)) = '\0';
#else
@@ -574,7 +570,7 @@
from "d:/", since "d:" and "d:/" are not the same.*/
}
#endif
- newp = (char *) __alloca (dirlen + 1);
+ newp = (char *) alloca (dirlen + 1);
#ifdef HAVE_MEMPCPY
*((char *) mempcpy (newp, pattern, dirlen)) = '\0';
#else
@@ -645,7 +641,7 @@
/* `sysconf' does not support _SC_LOGIN_NAME_MAX. Try
a moderate value. */
buflen = 20;
- name = (char *) __alloca (buflen);
+ name = (char *) alloca (buflen);
success = getlogin_r (name, buflen) >= 0;
# else
@@ -664,7 +660,7 @@
/* `sysconf' does not support _SC_GETPW_R_SIZE_MAX.
Try a moderate value. */
pwbuflen = 1024;
- pwtmpbuf = (char *) __alloca (pwbuflen);
+ pwtmpbuf = (char *) alloca (pwbuflen);
while (getpwnam_r (name, &pwbuf, pwtmpbuf, pwbuflen, &p)
!= 0)
@@ -675,7 +671,7 @@
break;
}
pwbuflen *= 2;
- pwtmpbuf = (char *) __alloca (pwbuflen);
+ pwtmpbuf = (char *) alloca (pwbuflen);
__set_errno (save);
}
# else
@@ -702,7 +698,7 @@
{
char *newp;
size_t home_len = strlen (home_dir);
- newp = (char *) __alloca (home_len + dirlen);
+ newp = (char *) alloca (home_len + dirlen);
# ifdef HAVE_MEMPCPY
mempcpy (mempcpy (newp, home_dir, home_len),
&dirname[1], dirlen);
@@ -725,7 +721,7 @@
else
{
char *newp;
- newp = (char *) __alloca (end_name - dirname);
+ newp = (char *) alloca (end_name - dirname);
# ifdef HAVE_MEMPCPY
*((char *) mempcpy (newp, dirname + 1, end_name - dirname))
= '\0';
@@ -749,7 +745,7 @@
/* `sysconf' does not support _SC_GETPW_R_SIZE_MAX. Try a
moderate value. */
buflen = 1024;
- pwtmpbuf = (char *) __alloca (buflen);
+ pwtmpbuf = (char *) alloca (buflen);
while (getpwnam_r (user_name, &pwbuf, pwtmpbuf, buflen, &p) != 0)
{
@@ -759,7 +755,7 @@
break;
}
buflen *= 2;
- pwtmpbuf = __alloca (buflen);
+ pwtmpbuf = alloca (buflen);
__set_errno (save);
}
# else
@@ -776,7 +772,7 @@
char *newp;
size_t home_len = strlen (home_dir);
size_t rest_len = end_name == NULL ? 0 : strlen (end_name);
- newp = (char *) __alloca (home_len + rest_len + 1);
+ newp = (char *) alloca (home_len + rest_len + 1);
# ifdef HAVE_MEMPCPY
*((char *) mempcpy (mempcpy (newp, home_dir, home_len),
end_name, rest_len)) = '\0';
@@ -1268,7 +1264,7 @@
struct stat st;
size_t patlen = strlen (pattern);
size_t dirlen = strlen (directory);
- char *fullname = (char *) __alloca (dirlen + 1 + patlen + 1);
+ char *fullname = (char *) alloca (dirlen + 1 + patlen + 1);
# ifdef HAVE_MEMPCPY
mempcpy (mempcpy (mempcpy (fullname, directory, dirlen),
@@ -1299,7 +1295,7 @@
{
/* This is a special case for matching directories like in
"*a/". */
- names = (struct globlink *) __alloca (sizeof (struct globlink));
+ names = (struct globlink *) alloca (sizeof (struct globlink));
names->name = (char *) malloc (1);
if (names->name == NULL)
goto memory_error;
@@ -1358,7 +1354,7 @@
if (fnmatch (pattern, name, fnm_flags) == 0)
{
struct globlink *new = (struct globlink *)
- __alloca (sizeof (struct globlink));
+ alloca (sizeof (struct globlink));
len = NAMLEN (d);
new->name = (char *) malloc (len + 1);
if (new->name == NULL)
@@ -1383,7 +1379,7 @@
{
size_t len = strlen (pattern);
nfound = 1;
- names = (struct globlink *) __alloca (sizeof (struct globlink));
+ names = (struct globlink *) alloca (sizeof (struct globlink));
names->next = NULL;
names->name = (char *) malloc (len + 1);
if (names->name == NULL)