[Pkg-virtualbox-commits] [kbuild] 03/10: Patch refresh

[Gianfranco Costamagna]

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

locutusofborg pushed a commit to branch experimental
in repository kbuild.

commit daa0bb7e9c7b50ef493a2c781706e5a9c5567f04
Author: Gianfranco Costamagna <locutusofborg at debian.org>
Date:   Fri Jan 13 17:54:10 2017 +0100

    Patch refresh
---
 debian/patches/01_gnukfreebsd.diff          | 10 +++++-----
 debian/patches/05_hppa-disable-threads.diff |  2 +-
 debian/patches/10_ppc64el.diff              |  2 +-
 debian/patches/11_find-glob.patch           |  4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/debian/patches/01_gnukfreebsd.diff b/debian/patches/01_gnukfreebsd.diff
index fa61996..3f92eae 100644
--- a/debian/patches/01_gnukfreebsd.diff
+++ b/debian/patches/01_gnukfreebsd.diff
@@ -154,7 +154,7 @@ Bug-Debian: http://bugs.debian.org/540665
  KBUILD_ARCHES    := x86 amd64 sparc32 sparc64 s390 s390x ppc32 ppc64 mips32 mips64 ia64 hppa32 hppa64 arm alpha noarch
  KBUILD_ARCHES_64 := amd64 sparc64 s390x ppc64 mips64 ia64 hppa64 alpha
  KBUILD_ARCHES_32 := x86 sparc32 s390 ppc32 mips32 hppa32 arm
-@@ -566,7 +566,7 @@ else ifeq ($(KBUILD_HOST),os2)
+@@ -591,7 +591,7 @@ else ifeq ($(KBUILD_HOST),os2)
  EXEC_X86_WIN32      := innopec.exe
  HOSTSUFF_EXE        := .exe
  
@@ -163,7 +163,7 @@ Bug-Debian: http://bugs.debian.org/540665
  # Unix (like) systems with wine.
  EXEC_X86_WIN32      := wine
  HOSTSUFF_EXE        :=
-@@ -610,7 +610,7 @@ SUFF_OBJ    := .o
+@@ -635,7 +635,7 @@ SUFF_OBJ    := .o
  SUFF_LIB    := .a
  SUFF_DLL    := .so
  SUFF_EXE    :=
@@ -247,7 +247,7 @@ Bug-Debian: http://bugs.debian.org/540665
  				return errx(EX_USAGE, "%s: invalid flag", flags);
 --- a/src/kmk/kmkbuiltin/rm.c
 +++ b/src/kmk/kmkbuiltin/rm.c
-@@ -657,7 +657,8 @@ check(char *path, char *name, struct sta
+@@ -675,7 +675,8 @@ check(char *path, char *name, struct sta
                      )
  			return (1);
  		bsd_strmode(sp->st_mode, modep);
@@ -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
-@@ -110,6 +110,9 @@ kmkmissing_SOURCES.freebsd = \
+@@ -111,6 +111,9 @@ kmkmissing_SOURCES.freebsd = \
  	kmkbuiltin/haikufakes.c \
  	glob/fnmatch.c
  
@@ -269,7 +269,7 @@ Bug-Debian: http://bugs.debian.org/540665
  kmkmissing_SOURCES.linux += \
  	kmkbuiltin/strlcpy.c
  
-@@ -249,6 +252,7 @@ kmk_SOURCES = \
+@@ -250,6 +253,7 @@ kmk_SOURCES = \
  kmk_SOURCES.win = \
  	w32/subproc/sub_proc.c
  
diff --git a/debian/patches/05_hppa-disable-threads.diff b/debian/patches/05_hppa-disable-threads.diff
index 4e3de29..da268e7 100644
--- a/debian/patches/05_hppa-disable-threads.diff
+++ b/debian/patches/05_hppa-disable-threads.diff
@@ -3,7 +3,7 @@ Author: Felix Geyer <debfx-pkg at fobos.de>
 
 --- a/src/kmk/Makefile.kmk
 +++ b/src/kmk/Makefile.kmk
-@@ -252,6 +252,9 @@ kmk_SOURCES = \
+@@ -253,6 +253,9 @@ kmk_SOURCES = \
  kmk_SOURCES.win = \
  	w32/subproc/sub_proc.c
  
diff --git a/debian/patches/10_ppc64el.diff b/debian/patches/10_ppc64el.diff
index 22e20e2..9eb708d 100644
--- a/debian/patches/10_ppc64el.diff
+++ b/debian/patches/10_ppc64el.diff
@@ -41,7 +41,7 @@ Index: kbuild/kBuild/header.kmk
  KBUILD_ARCHES_32 := x86 sparc32 s390 ppc32 mips32 hppa32 arm sh
  
  
-@@ -481,7 +481,7 @@ endif
+@@ -506,7 +506,7 @@ endif
  KBUILD_DEVTOOLS_TRG ?= $(KBUILD_DEVTOOLS)/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)
  KBUILD_DEVTOOLS_HST ?= $(KBUILD_DEVTOOLS)/$(KBUILD_HOST).$(KBUILD_HOST_ARCH)
  
diff --git a/debian/patches/11_find-glob.patch b/debian/patches/11_find-glob.patch
index 07a6160..fd70786 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
-@@ -1331,7 +1331,7 @@ print_dir_data_base (void)
+@@ -1340,7 +1340,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>
-@@ -1470,7 +1470,7 @@ dir_setup_glob (glob_t *gl)
+@@ -1479,7 +1479,7 @@ dir_setup_glob (glob_t *gl)
  #ifdef __EMX__ /* The FreeBSD implementation actually uses gl_lstat!! */
    gl->gl_lstat = local_stat;
  #endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-virtualbox/kbuild.git