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

[Gianfranco Costamagna]

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

locutusofborg-guest pushed a commit to branch master
in repository kbuild.

commit df8bc9f3702375b998528d0e4244ff98f80c1d6e
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Fri Jan 16 10:35:14 2015 +0100

    Patch refresh
---
 debian/patches/01_gnukfreebsd.diff        | 8 ++++----
 debian/patches/08_no_o3_optimization.diff | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/patches/01_gnukfreebsd.diff b/debian/patches/01_gnukfreebsd.diff
index b8b8cfc..03a1197 100644
--- a/debian/patches/01_gnukfreebsd.diff
+++ b/debian/patches/01_gnukfreebsd.diff
@@ -26,7 +26,7 @@ Bug-Debian: http://bugs.debian.org/540665
            errno = 0;
 --- a/src/kmk/incdep.c
 +++ b/src/kmk/incdep.c
-@@ -602,7 +602,7 @@ incdep_are_threads_enabled (void)
+@@ -638,7 +638,7 @@ incdep_are_threads_enabled (void)
    if (getenv ("KMK_THREADS_ENABLED"))
      return 1;
  
@@ -72,7 +72,7 @@ Bug-Debian: http://bugs.debian.org/540665
 +++ b/src/kmk/make.h
 @@ -215,7 +215,7 @@ extern unsigned long make_stats_ht_colli
  #  include <malloc/malloc.h>
- #  define SIZE_OF_HEAP_BLOCK(ptr)   malloc_good_size(ptr)
+ #  define SIZE_OF_HEAP_BLOCK(ptr)   malloc_size(ptr)
  
 -# elif defined(__linux__) /* glibc */
 +# elif defined(__linux__) || defined(__GLIBC__) /* glibc */
@@ -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
-@@ -304,7 +305,7 @@ endif
+@@ -312,7 +313,7 @@ endif
  
  ifndef TEMPLATE_BIN_TOOL
   # Use GCC3 when we're certain that the system is using GNU ld and ar.
@@ -270,7 +270,7 @@ Bug-Debian: http://bugs.debian.org/540665
  #kmk_LIBS.solaris = malloc
 --- a/src/kmk/file.c
 +++ b/src/kmk/file.c
-@@ -1042,7 +1042,8 @@ file_timestamp_now (int *resolution)
+@@ -1053,7 +1053,8 @@ file_timestamp_now (int *resolution)
       only one-second resolution.  The code below should work, but it's
       not worth the hassle of debugging it on hosts where it fails.  */
  #if FILE_TIMESTAMP_HI_RES
diff --git a/debian/patches/08_no_o3_optimization.diff b/debian/patches/08_no_o3_optimization.diff
index 6aa3d49..bf6a8aa 100644
--- a/debian/patches/08_no_o3_optimization.diff
+++ b/debian/patches/08_no_o3_optimization.diff
@@ -4,7 +4,7 @@ Bug-Debian: http://bugs.debian.org/697892
 
 --- a/Config.kmk
 +++ b/Config.kmk
-@@ -317,8 +317,8 @@ ifndef TEMPLATE_BIN_TOOL
+@@ -325,8 +325,8 @@ ifndef TEMPLATE_BIN_TOOL
   endif
   TEMPLATE_BIN_LDFLAGS           = -g
   TEMPLATE_BIN_LDFLAGS.profile   = -pg -p

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