[Pkg-virtualbox-commits] [kbuild] 02/04: New upstream version 0.1.9998svn3110+dfsg
Gianfranco Costamagna
locutusofborg at moszumanska.debian.org
Sat Oct 21 08:41:27 UTC 2017
This is an automated email from the git hooks/post-receive script.
locutusofborg pushed a commit to branch master
in repository kbuild.
commit 937808e60d25b16b787c370d4ac1a9ff0770524c
Author: Gianfranco Costamagna <locutusofborg at debian.org>
Date: Sat Oct 21 10:38:25 2017 +0200
New upstream version 0.1.9998svn3110+dfsg
---
Config.kmk | 4 +--
kBuild/env.sh | 4 +--
src/kObjCache/kObjCache.c | 10 ++++--
src/kash/Makefile.kmk | 5 ++-
src/kmk/Makefile.kmk | 5 ++-
src/kmk/kmkbuiltin.h | 15 ++++++++-
src/kmk/kmkbuiltin/cp_extern.h | 2 ++
src/kmk/kmkbuiltin/fts.c | 1 +
src/kmk/kmkbuiltin/install.c | 4 +--
src/kmk/kmkbuiltin/mv.c | 2 +-
src/kmk/kmkbuiltin/redirect.c | 7 +++-
src/kmk/kmkbuiltin/rm.c | 6 ++--
src/lib/kDep.c | 11 ++++++-
src/lib/kStuff/include/k/kDefs.h | 70 ++++++++++++++++++++++------------------
14 files changed, 98 insertions(+), 48 deletions(-)
diff --git a/Config.kmk b/Config.kmk
index 816f948..3c226ff 100644
--- a/Config.kmk
+++ b/Config.kmk
@@ -1,4 +1,4 @@
-# $Id: Config.kmk 3087 2017-10-03 13:31:19Z bird $
+# $Id: Config.kmk 3110 2017-10-20 19:14:56Z bird $
## @file
# Build Configuration.
#
@@ -379,7 +379,7 @@ endif
TEMPLATE_BIN-THREADED = Threaded command line binary
TEMPLATE_BIN-THREADED_EXTENDS = BIN
TEMPLATE_BIN-THREADED_EXTENDS_BY = appending
-if1of ($(KBUILD_TARGET), dragonfly freebsd gnukfbsd gnuknbsd linux netbsd openbsd)
+if1of ($(KBUILD_TARGET), dragonfly freebsd gnuhurd gnukfbsd gnuknbsd linux netbsd openbsd)
TEMPLATE_BIN-THREADED_LIBS = pthread
endif
diff --git a/kBuild/env.sh b/kBuild/env.sh
index 468bf3e..79d8f33 100755
--- a/kBuild/env.sh
+++ b/kBuild/env.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: env.sh 3103 2017-10-20 13:13:54Z bird $
+# $Id: env.sh 3104 2017-10-20 16:23:06Z bird $
## @file
# Environment setup script.
#
@@ -338,7 +338,7 @@ if test -z "$KBUILD_HOST_ARCH"; then
x86_64|AMD64|amd64|k8|k8l|k9|k10)
KBUILD_HOST_ARCH='amd64'
;;
- x86|i86pc|ia32|i[3456789]86|BePC)
+ x86|i86pc|ia32|i[3456789]86|BePC|i[3456789]86-AT[3456789]86)
KBUILD_HOST_ARCH='x86'
;;
alpha)
diff --git a/src/kObjCache/kObjCache.c b/src/kObjCache/kObjCache.c
index e3d590c..fc8e51e 100644
--- a/src/kObjCache/kObjCache.c
+++ b/src/kObjCache/kObjCache.c
@@ -1,4 +1,4 @@
-/* $Id: kObjCache.c 3065 2017-09-30 12:52:35Z bird $ */
+/* $Id: kObjCache.c 3110 2017-10-20 19:14:56Z bird $ */
/** @file
* kObjCache - Object Cache.
*/
@@ -42,7 +42,11 @@
#include <limits.h>
#include <ctype.h>
#ifndef PATH_MAX
-# define PATH_MAX _MAX_PATH /* windows */
+# ifdef _MAX_PATH
+# define PATH_MAX _MAX_PATH /* windows */
+# else
+# define PATH_MAX 4096 /* gnu hurd */
+# endif
#endif
#if defined(__OS2__) || defined(__WIN__)
# include <process.h>
@@ -5094,7 +5098,7 @@ int main(int argc, char **argv)
}
else if (!strcmp(argv[i], "-V") || !strcmp(argv[i], "--version"))
{
- printf("kObjCache - kBuild version %d.%d.%d ($Revision: 3065 $)\n"
+ printf("kObjCache - kBuild version %d.%d.%d ($Revision: 3110 $)\n"
"Copyright (c) 2007-2012 knut st. osmundsen\n",
KBUILD_VERSION_MAJOR, KBUILD_VERSION_MINOR, KBUILD_VERSION_PATCH);
return 0;
diff --git a/src/kash/Makefile.kmk b/src/kash/Makefile.kmk
index 63f068b..9cb18cf 100644
--- a/src/kash/Makefile.kmk
+++ b/src/kash/Makefile.kmk
@@ -1,4 +1,4 @@
-# $Id: Makefile.kmk 3073 2017-10-02 08:45:19Z bird $
+# $Id: Makefile.kmk 3110 2017-10-20 19:14:56Z bird $
## @file
# Sub-makefile for kash.
#
@@ -102,6 +102,9 @@ kash_SOURCES = \
shheap.c \
shthread.c \
shfile.c
+kash_SOURCES.gnuhurd = \
+ sys_signame.c \
+ strlcpy.c
kash_SOURCES.gnukfbsd = \
sys_signame.c \
strlcpy.c
diff --git a/src/kmk/Makefile.kmk b/src/kmk/Makefile.kmk
index a86e8fc..f27b384 100644
--- a/src/kmk/Makefile.kmk
+++ b/src/kmk/Makefile.kmk
@@ -1,4 +1,4 @@
-# $Id: Makefile.kmk 3062 2017-09-30 11:26:21Z bird $
+# $Id: Makefile.kmk 3110 2017-10-20 19:14:56Z bird $
## @file
# Sub-makefile for kmk / GNU Make.
#
@@ -107,6 +107,9 @@ kmkmissing_SOURCES.dragonfly = \
kmkmissing_SOURCES.freebsd = \
glob/fnmatch.c
+kmkmissing_SOURCES.gnuhurd += \
+ kmkbuiltin/strlcpy.c
+
kmkmissing_SOURCES.gnukfbsd += \
kmkbuiltin/strlcpy.c
diff --git a/src/kmk/kmkbuiltin.h b/src/kmk/kmkbuiltin.h
index 077b51a..5daaf80 100644
--- a/src/kmk/kmkbuiltin.h
+++ b/src/kmk/kmkbuiltin.h
@@ -1,4 +1,4 @@
-/* $Id: kmkbuiltin.h 3059 2017-09-21 13:34:15Z bird $ */
+/* $Id: kmkbuiltin.h 3108 2017-10-20 17:01:40Z bird $ */
/** @file
* kMk Builtin command handling.
*/
@@ -34,6 +34,19 @@
# include <sys/types.h>
#endif
+/* For the GNU/hurd weirdo. */
+#ifndef PATH_MAX
+# ifdef MAXPATHLEN
+# define PATH_MAX MAXPATHLEN
+# else
+# define PATH_MAX 4096
+# endif
+#endif
+#ifndef MAXPATHLEN
+# define MAXPATHLEN PATH_MAX
+#endif
+
+
#include "kbuild_version.h"
struct child;
diff --git a/src/kmk/kmkbuiltin/cp_extern.h b/src/kmk/kmkbuiltin/cp_extern.h
index efd6f50..fdc0886 100644
--- a/src/kmk/kmkbuiltin/cp_extern.h
+++ b/src/kmk/kmkbuiltin/cp_extern.h
@@ -30,6 +30,8 @@
* $FreeBSD: src/bin/cp/extern.h,v 1.19 2004/04/06 20:06:44 markm Exp $
*/
+#include "kmkbuiltin.h" /* for PATH_MAX on GNU/hurd */
+
typedef struct {
char *p_end; /* pointer to NULL at end of path */
char *target_end; /* pointer to end of target base */
diff --git a/src/kmk/kmkbuiltin/fts.c b/src/kmk/kmkbuiltin/fts.c
index 133efb4..c8532fb 100644
--- a/src/kmk/kmkbuiltin/fts.c
+++ b/src/kmk/kmkbuiltin/fts.c
@@ -60,6 +60,7 @@ __RCSID("$NetBSD: __fts13.c,v 1.44 2005/01/19 00:59:48 mycroft Exp $");
#ifdef HAVE_ALLOCA_H
# include <alloca.h>
#endif
+#include "kmkbuiltin.h" /* MAXPATHLEN for GNU/hurd */
#ifdef __sun__
# include "solfakes.h"
diff --git a/src/kmk/kmkbuiltin/install.c b/src/kmk/kmkbuiltin/install.c
index c102daa..c0fced1 100644
--- a/src/kmk/kmkbuiltin/install.c
+++ b/src/kmk/kmkbuiltin/install.c
@@ -52,7 +52,7 @@ __FBSDID("$FreeBSD: src/usr.bin/xinstall/xinstall.c,v 1.66 2005/01/25 14:34:57 s
# ifdef USE_MMAP
# include <sys/mman.h>
# endif
-# ifndef __HAIKU__
+# if !defined(__HAIKU__) && !defined(__gnu_hurd__)
# include <sys/mount.h>
# endif
# include <sys/wait.h>
@@ -214,7 +214,7 @@ kmk_builtin_install(int argc, char *argv[], char ** envp)
dodir = 1;
break;
case 'f':
-#if defined(UF_IMMUTABLE) && K_OS != K_OS_GNU_KFBSD
+#if defined(UF_IMMUTABLE) && K_OS != K_OS_GNU_KFBSD && K_OS != K_OS_GNU_HURD
flags = optarg;
if (strtofflags(&flags, &fset, NULL))
return errx(EX_USAGE, "%s: invalid flag", flags);
diff --git a/src/kmk/kmkbuiltin/mv.c b/src/kmk/kmkbuiltin/mv.c
index 28c04f1..c4de2f0 100644
--- a/src/kmk/kmkbuiltin/mv.c
+++ b/src/kmk/kmkbuiltin/mv.c
@@ -55,7 +55,7 @@ __FBSDID("$FreeBSD: src/bin/mv/mv.c,v 1.46 2005/09/05 04:36:08 csjp Exp $");
# include <sys/param.h>
# include <sys/time.h>
# include <sys/wait.h>
-# ifndef __HAIKU__
+# if !defined(__HAIKU__) && !defined(__gnu_hurd__)
# include <sys/mount.h>
# endif
#endif
diff --git a/src/kmk/kmkbuiltin/redirect.c b/src/kmk/kmkbuiltin/redirect.c
index 699c3db..6af29c7 100644
--- a/src/kmk/kmkbuiltin/redirect.c
+++ b/src/kmk/kmkbuiltin/redirect.c
@@ -1,4 +1,4 @@
-/* $Id: redirect.c 3085 2017-10-03 11:01:54Z bird $ */
+/* $Id: redirect.c 3110 2017-10-20 19:14:56Z bird $ */
/** @file
* kmk_redirect - Do simple program <-> file redirection (++).
*/
@@ -62,6 +62,11 @@
#include <k/kTypes.h>
#include "err.h"
#include "kbuild_version.h"
+#if defined(__gnu_hurd__) && !defined(kmk_builtin_redirect) /* need constant */
+# undef GET_PATH_MAX
+# undef PATH_MAX
+# define GET_PATH_MAX PATH_MAX
+#endif
#include "kmkbuiltin.h"
#ifdef KMK
# ifdef KBUILD_OS_WINDOWS
diff --git a/src/kmk/kmkbuiltin/rm.c b/src/kmk/kmkbuiltin/rm.c
index b019968..5c814c9 100644
--- a/src/kmk/kmkbuiltin/rm.c
+++ b/src/kmk/kmkbuiltin/rm.c
@@ -45,7 +45,9 @@ static char sccsid[] = "@(#)rm.c 8.5 (Berkeley) 4/18/94";
#include <sys/stat.h>
#if !defined(_MSC_VER) && !defined(__HAIKU__)
# include <sys/param.h>
-# include <sys/mount.h>
+# ifndef __gnu_hurd__
+# include <sys/mount.h>
+# endif
#endif
#include "err.h"
@@ -680,7 +682,7 @@ check(char *path, char *name, struct stat *sp)
)
return (1);
bsd_strmode(sp->st_mode, modep);
-#if defined(SF_APPEND) && K_OS != K_OS_GNU_KFBSD
+#if defined(SF_APPEND) && K_OS != K_OS_GNU_KFBSD && K_OS != K_OS_GNU_HURD
if ((flagsp = fflagstostr(sp->st_flags)) == NULL)
exit(err(1, "fflagstostr"));
(void)fprintf(stderr, "override %s%s%s/%s %s%sfor %s? ",
diff --git a/src/lib/kDep.c b/src/lib/kDep.c
index caa63bd..09415ee 100644
--- a/src/lib/kDep.c
+++ b/src/lib/kDep.c
@@ -1,4 +1,4 @@
-/* $Id: kDep.c 3063 2017-09-30 11:34:07Z bird $ */
+/* $Id: kDep.c 3105 2017-10-20 16:40:25Z bird $ */
/** @file
* kDep - Common Dependency Managemnt Code.
*/
@@ -63,6 +63,15 @@ extern int kwFsPathExists(const char *pszPath);
#endif
+/*********************************************************************************************************************************
+* Defined Constants And Macros *
+*********************************************************************************************************************************/
+/* For the GNU/hurd weirdo. */
+#if !defined(PATH_MAX) && !defined(_MAX_PATH)
+# define PATH_MAX 2048
+#endif
+
+
/*******************************************************************************
* Global Variables *
*******************************************************************************/
diff --git a/src/lib/kStuff/include/k/kDefs.h b/src/lib/kStuff/include/k/kDefs.h
index 9730fbc..11e67b8 100644
--- a/src/lib/kStuff/include/k/kDefs.h
+++ b/src/lib/kStuff/include/k/kDefs.h
@@ -1,4 +1,4 @@
-/* $Id: kDefs.h 100 2017-10-01 13:08:49Z bird $ */
+/* $Id: kDefs.h 104 2017-10-20 17:19:04Z bird $ */
/** @file
* kTypes - Defines and Macros.
*/
@@ -46,26 +46,28 @@
#define K_OS_DRAGONFLY 2
/** FreeBSD. */
#define K_OS_FREEBSD 3
+/** GNU/Hurd. */
+#define K_OS_GNU_HURD 4
/** GNU/kFreeBSD. */
-#define K_OS_GNU_KFBSD 4
+#define K_OS_GNU_KFBSD 5
/** GNU/kNetBSD or GNU/NetBSD or whatever the decide to call it. */
-#define K_OS_GNU_KNBSD 5
+#define K_OS_GNU_KNBSD 6
/** Linux. */
-#define K_OS_LINUX 6
+#define K_OS_LINUX 7
/** NetBSD. */
-#define K_OS_NETBSD 7
+#define K_OS_NETBSD 8
/** NT (native). */
-#define K_OS_NT 8
+#define K_OS_NT 9
/** OpenBSD*/
-#define K_OS_OPENBSD 9
+#define K_OS_OPENBSD 10
/** OS/2 */
-#define K_OS_OS2 10
+#define K_OS_OS2 11
/** Solaris */
-#define K_OS_SOLARIS 11
+#define K_OS_SOLARIS 12
/** Windows. */
-#define K_OS_WINDOWS 12
+#define K_OS_WINDOWS 13
/** The max K_OS_* value (exclusive). */
-#define K_OS_MAX 13
+#define K_OS_MAX 14
/** @} */
/** @def K_OS
@@ -88,6 +90,8 @@
# define K_OS K_OS_FREEBSD
# elif defined(__FreeBSD_kernel__)
# define K_OS K_OS_GNU_KFBSD
+# elif defined(__gnu_hurd__)
+# define K_OS K_OS_GNU_HURD
# elif defined(__gnu_linux__)
# define K_OS K_OS_LINUX
# elif defined(__NetBSD__) /*??*/
@@ -141,45 +145,47 @@
/** Clone or Intel 16-bit x86. */
#define K_ARCH_X86_16 ( 1 | K_ARCH_BIT_16 | K_ARCH_END_LITTLE)
/** Clone or Intel 32-bit x86. */
-#define K_ARCH_X86_32 ( 2 | K_ARCH_BIT_32 | K_ARCH_END_LITTLE)
+#define K_ARCH_X86_32 ( 1 | K_ARCH_BIT_32 | K_ARCH_END_LITTLE)
/** AMD64 (including clones). */
-#define K_ARCH_AMD64 ( 3 | K_ARCH_BIT_64 | K_ARCH_END_LITTLE)
+#define K_ARCH_AMD64 ( 2 | K_ARCH_BIT_64 | K_ARCH_END_LITTLE)
/** Itanic (64-bit). */
-#define K_ARCH_IA64 ( 4 | K_ARCH_BIT_64 | K_ARCH_END_BI)
+#define K_ARCH_IA64 ( 3 | K_ARCH_BIT_64 | K_ARCH_END_BI)
/** ALPHA (64-bit). */
-#define K_ARCH_ALPHA ( 5 | K_ARCH_BIT_64 | K_ARCH_END_BI)
+#define K_ARCH_ALPHA ( 4 | K_ARCH_BIT_64 | K_ARCH_END_BI)
/** ALPHA limited to 32-bit. */
-#define K_ARCH_ALPHA_32 ( 6 | K_ARCH_BIT_32 | K_ARCH_END_BI)
+#define K_ARCH_ALPHA_32 ( 4 | K_ARCH_BIT_32 | K_ARCH_END_BI)
/** 32-bit ARM. */
-#define K_ARCH_ARM_32 ( 7 | K_ARCH_BIT_32 | K_ARCH_END_BI)
+#define K_ARCH_ARM_32 ( 5 | K_ARCH_BIT_32 | K_ARCH_END_BI)
/** 64-bit ARM. */
-#define K_ARCH_ARM_64 ( 8 | 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). */
+#define K_ARCH_M68K ( 6 | K_ARCH_BIT_32 | K_ARCH_END_BIG)
/** 32-bit MIPS. */
-#define K_ARCH_MIPS_32 ( 9 | 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. */
-#define K_ARCH_MIPS_64 (10 | K_ARCH_BIT_64 | K_ARCH_END_BI)
+#define K_ARCH_MIPS_64 ( 7 | K_ARCH_BIT_64 | K_ARCH_END_BI)
/** 32-bit PA-RISC. */
-#define K_ARCH_PARISC_32 (11 | K_ARCH_BIT_32 | K_ARCH_END_BI)
+#define K_ARCH_PARISC_32 ( 8 | K_ARCH_BIT_32 | K_ARCH_END_BI)
/** 64-bit PA-RISC. */
-#define K_ARCH_PARISC_64 (12 | K_ARCH_BIT_64 | K_ARCH_END_BI)
+#define K_ARCH_PARISC_64 ( 8 | K_ARCH_BIT_64 | K_ARCH_END_BI)
/** 32-bit PowerPC. */
-#define K_ARCH_POWERPC_32 (13 | 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. */
-#define K_ARCH_POWERPC_64 (14 | K_ARCH_BIT_64 | K_ARCH_END_BI)
+#define K_ARCH_POWERPC_64 ( 9 | K_ARCH_BIT_64 | K_ARCH_END_BI)
/** 32(31)-bit S390. */
-#define K_ARCH_S390_32 (15 | K_ARCH_BIT_32 | K_ARCH_END_BIG)
+#define K_ARCH_S390_32 (10 | K_ARCH_BIT_32 | K_ARCH_END_BIG)
/** 64-bit S390. */
-#define K_ARCH_S390_64 (16 | K_ARCH_BIT_64 | K_ARCH_END_BIG)
+#define K_ARCH_S390_64 (10 | K_ARCH_BIT_64 | K_ARCH_END_BIG)
/** 32-bit SuperH. */
-#define K_ARCH_SH_32 (17 | K_ARCH_BIT_32 | K_ARCH_END_BI)
+#define K_ARCH_SH_32 (11 | K_ARCH_BIT_32 | K_ARCH_END_BI)
/** 64-bit SuperH. */
-#define K_ARCH_SH_64 (17 | K_ARCH_BIT_64 | K_ARCH_END_BI)
+#define K_ARCH_SH_64 (11 | K_ARCH_BIT_64 | K_ARCH_END_BI)
/** 32-bit SPARC. */
-#define K_ARCH_SPARC_32 (18 | K_ARCH_BIT_32 | K_ARCH_END_BIG)
+#define K_ARCH_SPARC_32 (12 | K_ARCH_BIT_32 | K_ARCH_END_BIG)
/** 64-bit SPARC. */
-#define K_ARCH_SPARC_64 (19 | K_ARCH_BIT_64 | K_ARCH_END_BI)
+#define K_ARCH_SPARC_64 (12 | K_ARCH_BIT_64 | K_ARCH_END_BI)
/** The end of the valid architecture values (exclusive). */
-#define K_ARCH_MAX (20)
+#define K_ARCH_MAX (12+1)
/** @} */
@@ -204,6 +210,8 @@
# define K_ARCH K_ARCH_PARISC_64
# elif defined(__hppa__)
# define K_ARCH K_ARCH_PARISC_32
+# elif defined(__m68k__)
+# define K_ARCH K_ARCH_M68K
# elif defined(__mips64)
# define K_ARCH K_ARCH_MIPS_64
# elif defined(__mips__)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-virtualbox/kbuild.git
More information about the Pkg-virtualbox-commits
mailing list