[Pkg-virtualbox-commits] [kbuild] 01/01: Patch refresh

Gianfranco Costamagna locutusofborg at moszumanska.debian.org
Wed Sep 7 08:52:49 UTC 2016 

This is an automated email from the git hooks/post-receive script.

locutusofborg pushed a commit to branch master
in repository kbuild.

commit 5987897fcc5ef69aac40c86af90a421bcb9bfab4
Author: Gianfranco Costamagna <locutusofborg at debian.org>
Date:   Wed Sep 7 10:52:41 2016 +0200

    Patch refresh
---
 debian/patches/01_gnukfreebsd.diff                 | 42 +++++++++++-----------
 debian/patches/02_sh4.diff                         |  4 +--
 debian/patches/05_hppa-disable-threads.diff        |  6 ++--
 debian/patches/06_binutils-gold.diff               |  2 +-
 ...ord_files_SV_33034_Changes_fatal_to_error.patch |  2 +-
 debian/patches/10_ppc64el.diff                     |  4 +--
 debian/patches/11_find-glob.patch                  |  4 +--
 debian/patches/12_arm64.diff                       |  4 +--
 8 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/debian/patches/01_gnukfreebsd.diff b/debian/patches/01_gnukfreebsd.diff
index 2d827fd..fa61996 100644
--- a/debian/patches/01_gnukfreebsd.diff
+++ b/debian/patches/01_gnukfreebsd.diff
@@ -15,7 +15,7 @@ Bug-Debian: http://bugs.debian.org/540665
  # include <sys/mount.h>
  #endif
  /* bird: end */
-@@ -814,7 +814,7 @@ dir_contents_file_exists_p (struct direc
+@@ -835,7 +835,7 @@ dir_contents_file_exists_p (struct direc
           To exactly determin the cause here, I should probably do some smbfs
           tracing, but for now just ignoring the EBADF on seems to work.
           (The smb server is 64-bit vista, btw.) */
@@ -26,7 +26,7 @@ Bug-Debian: http://bugs.debian.org/540665
            errno = 0;
 --- a/src/kmk/incdep.c
 +++ b/src/kmk/incdep.c
-@@ -638,7 +638,7 @@ incdep_are_threads_enabled (void)
+@@ -678,7 +678,7 @@ incdep_are_threads_enabled (void)
    if (getenv ("KMK_THREADS_ENABLED"))
      return 1;
  
@@ -37,7 +37,7 @@ Bug-Debian: http://bugs.debian.org/540665
     || getenv ("FAKEROOTUID")
 --- a/src/kmk/kbuild.c
 +++ b/src/kmk/kbuild.c
-@@ -133,7 +133,7 @@ void init_kbuild(int argc, char **argv)
+@@ -134,7 +134,7 @@ void init_kbuild(int argc, char **argv)
          }
      }
  
@@ -79,32 +79,32 @@ Bug-Debian: http://bugs.debian.org/540665
  #  include <malloc.h>
  #  define SIZE_OF_HEAP_BLOCK(ptr)   malloc_usable_size(ptr)
  
---- a/src/lib/k/kDefs.h
-+++ b/src/lib/k/kDefs.h
-@@ -58,8 +58,10 @@
- #define K_OS_SOLARIS    10
+--- a/src/lib/kStuff/include/k/kDefs.h
++++ b/src/lib/kStuff/include/k/kDefs.h
+@@ -60,8 +60,10 @@
+ #define K_OS_SOLARIS    9
  /** Windows. */
- #define K_OS_WINDOWS    11
+ #define K_OS_WINDOWS    10
 +/** GNU/kFreeBSD (move to 3 probably) */
-+#define K_OS_GNUKFREEBSD 12
++#define K_OS_GNUKFREEBSD 11
  /** The max K_OS_* value (exclusive). */
--#define K_OS_MAX        12
-+#define K_OS_MAX        13
+-#define K_OS_MAX        11
++#define K_OS_MAX        12
  /** @} */
  
  /** @def K_OS
-@@ -80,6 +82,8 @@
+@@ -82,6 +84,8 @@
  #  define K_OS      K_OS_DRAGONFLY
  # elif defined(__FreeBSD__) /*??*/
  #  define K_OS      K_OS_FREEBSD
 +# elif defined(__FreeBSD_kernel__) /*??*/
 +#  define K_OS      K_OS_GNUKFREEBSD
- # elif defined(__HAIKU__)
- #  define K_OS      K_OS_HAIKU
  # elif defined(__gnu_linux__)
+ #  define K_OS      K_OS_LINUX
+ # elif defined(__NetBSD__) /*??*/
 --- a/Config.kmk
 +++ b/Config.kmk
-@@ -119,6 +119,7 @@ endif
+@@ -128,6 +128,7 @@ endif
  #
  DEFS.darwin  += KBUILD_OS_DARWIN
  DEFS.freebsd += KBUILD_OS_FREEBSD
@@ -112,7 +112,7 @@ Bug-Debian: http://bugs.debian.org/540665
  DEFS.linux   += KBUILD_OS_LINUX
  DEFS.netbsd  += KBUILD_OS_NETBSD
  DEFS.openbsd += KBUILD_OS_OPENBSD
-@@ -312,7 +313,7 @@ endif
+@@ -323,7 +324,7 @@ endif
  
  ifndef TEMPLATE_BIN_TOOL
   # Use GCC3 when we're certain that the system is using GNU ld and ar.
@@ -121,7 +121,7 @@ Bug-Debian: http://bugs.debian.org/540665
    TEMPLATE_BIN_TOOL              = GCC3
   else
    TEMPLATE_BIN_TOOL              = GCC3PLAIN
-@@ -361,7 +362,7 @@ endif
+@@ -372,7 +373,7 @@ endif
  TEMPLATE_BIN-THREADED = Threaded command line binary
  TEMPLATE_BIN-THREADED_EXTENDS = BIN
  TEMPLATE_BIN-THREADED_EXTENDS_BY = appending
@@ -259,7 +259,7 @@ Bug-Debian: http://bugs.debian.org/540665
  		(void)fprintf(stderr, "override %s%s%s/%s %s%sfor %s? ",
 --- a/src/kmk/Makefile.kmk
 +++ b/src/kmk/Makefile.kmk
-@@ -111,6 +111,9 @@ kmkmissing_SOURCES.freebsd = \
+@@ -110,6 +110,9 @@ kmkmissing_SOURCES.freebsd = \
  	kmkbuiltin/haikufakes.c \
  	glob/fnmatch.c
  
@@ -269,9 +269,9 @@ Bug-Debian: http://bugs.debian.org/540665
  kmkmissing_SOURCES.linux += \
  	kmkbuiltin/strlcpy.c
  
-@@ -244,6 +247,7 @@ kmk_SOURCES = \
- 	kbuild.c \
- 	kbuild-object.c
+@@ -249,6 +252,7 @@ kmk_SOURCES = \
+ kmk_SOURCES.win = \
+ 	w32/subproc/sub_proc.c
  
 +kmk_DEFS.gnukfreebsd = CONFIG_WITHOUT_THREADS
  kmk_DEFS.freebsd.x86 = CONFIG_WITHOUT_THREADS
diff --git a/debian/patches/02_sh4.diff b/debian/patches/02_sh4.diff
index c73a706..8177c1a 100644
--- a/debian/patches/02_sh4.diff
+++ b/debian/patches/02_sh4.diff
@@ -28,8 +28,8 @@ Bug-Debian: http://bugs.debian.org/544974
  
  
  #
---- a/src/lib/k/kDefs.h
-+++ b/src/lib/k/kDefs.h
+--- a/src/lib/kStuff/include/k/kDefs.h
++++ b/src/lib/kStuff/include/k/kDefs.h
 @@ -170,8 +170,10 @@
  #define K_ARCH_SPARC_32         (17 | K_ARCH_BIT_32 | K_ARCH_END_BIG)
  /** 64-bit SPARC. */
diff --git a/debian/patches/05_hppa-disable-threads.diff b/debian/patches/05_hppa-disable-threads.diff
index 271e298..4e3de29 100644
--- a/debian/patches/05_hppa-disable-threads.diff
+++ b/debian/patches/05_hppa-disable-threads.diff
@@ -3,9 +3,9 @@ Author: Felix Geyer <debfx-pkg at fobos.de>
 
 --- a/src/kmk/Makefile.kmk
 +++ b/src/kmk/Makefile.kmk
-@@ -247,6 +247,9 @@ kmk_SOURCES = \
- 	kbuild.c \
- 	kbuild-object.c
+@@ -252,6 +252,9 @@ kmk_SOURCES = \
+ kmk_SOURCES.win = \
+ 	w32/subproc/sub_proc.c
  
 +kmk_DEFS.hppa32 = CONFIG_WITHOUT_THREADS
 +kmk_DEFS.hppa64 = CONFIG_WITHOUT_THREADS
diff --git a/debian/patches/06_binutils-gold.diff b/debian/patches/06_binutils-gold.diff
index 8e72ceb..a7aab27 100644
--- a/debian/patches/06_binutils-gold.diff
+++ b/debian/patches/06_binutils-gold.diff
@@ -5,7 +5,7 @@ Bug-Debian: http://bugs.debian.org/554937
 diff -up kBuild-0.1.5-p1/Config.kmk.pthreads kBuild-0.1.5-p1/Config.kmk
 --- kBuild-0.1.5-p1/Config.kmk.pthreads	2010-02-18 08:27:24.287688965 +0100
 +++ kBuild-0.1.5-p1/Config.kmk	2010-02-18 08:28:07.505493345 +0100
-@@ -332,6 +332,8 @@ ifndef TEMPLATE_BIN_TOOL
+@@ -343,6 +343,8 @@ ifndef TEMPLATE_BIN_TOOL
   endif
   ifeq ($(KBUILD_TARGET),linux)
    TEMPLATE_BIN_LIBS            += rt
diff --git a/debian/patches/09_read.c_record_files_SV_33034_Changes_fatal_to_error.patch b/debian/patches/09_read.c_record_files_SV_33034_Changes_fatal_to_error.patch
index e53b777..f62eba9 100644
--- a/debian/patches/09_read.c_record_files_SV_33034_Changes_fatal_to_error.patch
+++ b/debian/patches/09_read.c_record_files_SV_33034_Changes_fatal_to_error.patch
@@ -44,7 +44,7 @@ diff --git a/src/kmk/read.c b/src/kmk/read.c
 index ebc6a63..9a326bb 100644
 --- a/src/kmk/read.c
 +++ b/src/kmk/read.c
-@@ -2782,7 +2782,7 @@ l_next:
+@@ -2786,7 +2786,7 @@ l_next:
        /* Reduce escaped percents.  If there are any unescaped it's an error  */
        name = filenames->name;
        if (find_percent_cached (&name))
diff --git a/debian/patches/10_ppc64el.diff b/debian/patches/10_ppc64el.diff
index 4921449..22e20e2 100644
--- a/debian/patches/10_ppc64el.diff
+++ b/debian/patches/10_ppc64el.diff
@@ -52,8 +52,8 @@ Index: kbuild/kBuild/header.kmk
   else ifeq ($(KBUILD_TARGET_ARCH),hppa64)
 diff --git a/src/lib/k/kDefs.h b/src/lib/k/kDefs.h
 index b67886f..47d8c58 100644
---- a/src/lib/k/kDefs.h
-+++ b/src/lib/k/kDefs.h
+--- a/src/lib/kStuff/include/k/kDefs.h
++++ b/src/lib/kStuff/include/k/kDefs.h
 @@ -162,18 +164,20 @@
  #define K_ARCH_POWERPC_32       (13 | K_ARCH_BIT_32 | K_ARCH_END_BI)
  /** 64-bit PowerPC. */
diff --git a/debian/patches/11_find-glob.patch b/debian/patches/11_find-glob.patch
index 78e9f15..07a6160 100644
--- a/debian/patches/11_find-glob.patch
+++ b/debian/patches/11_find-glob.patch
@@ -6,7 +6,7 @@ Last-Update: <2015-06-22>
 #Bug: http://trac.netlabs.org/kbuild/ticket/117
 --- a/src/kmk/dir.c	2015-06-22 00:19:25.132189626 +0100
 +++ b/src/kmk/dir.c	2015-06-22 00:21:27.247583054 +0100
-@@ -1310,7 +1310,7 @@ print_dir_data_base (void)
+@@ -1331,7 +1331,7 @@ print_dir_data_base (void)
  

  /* Hooks for globbing.  */
  
@@ -15,7 +15,7 @@ Last-Update: <2015-06-22>
  # include "glob/glob.h"
  #else
  #include <glob.h>
-@@ -1449,7 +1449,7 @@ dir_setup_glob (glob_t *gl)
+@@ -1470,7 +1470,7 @@ dir_setup_glob (glob_t *gl)
  #ifdef __EMX__ /* The FreeBSD implementation actually uses gl_lstat!! */
    gl->gl_lstat = local_stat;
  #endif
diff --git a/debian/patches/12_arm64.diff b/debian/patches/12_arm64.diff
index 4ee1c85..9e24dfc 100644
--- a/debian/patches/12_arm64.diff
+++ b/debian/patches/12_arm64.diff
@@ -24,8 +24,8 @@ Description: Add arm64 to supported architectures
  KBUILD_ARCHES_32 := x86 sparc32 s390 ppc32 mips32 hppa32 arm sh
  
  
---- a/src/lib/k/kDefs.h
-+++ b/src/lib/k/kDefs.h
+--- a/src/lib/kStuff/include/k/kDefs.h
++++ b/src/lib/kStuff/include/k/kDefs.h
 @@ -194,6 +194,8 @@
  #  define K_ARCH    K_ARCH_ALPHA
  # elif defined(__arm__) || defined(__arm32__)

-- 
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