[Pkg-virtualbox-commits] [kbuild] 01/01: Sync patches with fedora, thanks a lot Sérgio Basto!

Wed May 13 14:33:23 UTC 2015

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

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

commit 5df3a02c245bbe1b30bb0e6272b0a9176da0687f
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Wed May 13 16:31:53 2015 +0200

    Sync patches with fedora, thanks a lot Sérgio Basto!
---
 debian/changelog                     | 11 +++++
 debian/patches/04_armv7l.diff        |  2 +-
 debian/patches/06_binutils-gold.diff | 27 +++++------
 debian/patches/11_find-glob.patch    | 93 +++++-------------------------------
 debian/patches/12_arm64.diff         |  2 +-
 debian/patches/series                |  2 +-
 6 files changed, 37 insertions(+), 100 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8ae690a..f25bdd3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+kbuild (1:0.1.9998svn2780+dfsg-2) unstable; urgency=low
+
+  * Sync kbuild with Fedora patches (thanks Sérgio Basto!):
+    - sync 04_armv7l.diff, adding some more arm archs
+    - 06_binutils-gold.diff add pthread for all archs, and
+      -Wl,--as-needed to strip where not needed.
+    - simplify a lot 11_find-glob.patch
+    - disable 08_no_o3_optimization.diff the problem was fixed upstream.
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Wed, 13 May 2015 16:29:22 +0200
+
 kbuild (1:0.1.9998svn2780+dfsg-1) unstable; urgency=medium
 
   [ Gianfranco Costamagna ]
diff --git a/debian/patches/04_armv7l.diff b/debian/patches/04_armv7l.diff
index cbf95c2..f5d448a 100644
--- a/debian/patches/04_armv7l.diff
+++ b/debian/patches/04_armv7l.diff
@@ -9,7 +9,7 @@ Bug-Ubuntu: https://bugs.launchpad.net/bugs/535093
              KBUILD_HOST_ARCH='hppa64'
              ;;
 -        arm|armv4l|armv5tel|armv5tejl)
-+        arm|armv4l|armv5tel|armv5tejl|armv7l)
++        armv3l|armv4b|armv4l|armv4tl|armv5tel|armv5tejl|armv6l|armv7l|armv7hl|armv7hnl)
              KBUILD_HOST_ARCH='arm'
              ;;
          alpha)
diff --git a/debian/patches/06_binutils-gold.diff b/debian/patches/06_binutils-gold.diff
index cf91977..8e72ceb 100644
--- a/debian/patches/06_binutils-gold.diff
+++ b/debian/patches/06_binutils-gold.diff
@@ -2,18 +2,15 @@ Description: Fix FTBFS with binutils-gold
 Author: Felix Geyer <debfx-pkg at fobos.de>
 Bug-Debian: http://bugs.debian.org/554937
 
---- a/src/kmk/Makefile.kmk
-+++ b/src/kmk/Makefile.kmk
-@@ -286,6 +286,12 @@ kmk_SOURCES += \
- ##kmk_DEFS += KMK_PRF=1
- ##kmkmissing_DEFS += KMK_PRF=1
- 
-+if1of ($(KBUILD_TARGET), linux gnukfreebsd)
-+ ifn1of ($(KBUILD_TARGET_ARCH), hppa32 hppa64)
-+  TEMPLATE_BIN-THREADED_LIBS = pthread
-+ endif
-+endif
-+
- #
- # Standalone kmkbuiltin commands.
- #
+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
+  endif
+  ifeq ($(KBUILD_TARGET),linux)
+   TEMPLATE_BIN_LIBS            += rt
++  TEMPLATE_BIN_LIBS            += pthread
++  TEMPLATE_BIN_LDFLAGS         += -Wl,--as-needed
+  endif
+   TEMPLATE_BIN_CFLAGS.x86      += -m32
+   TEMPLATE_BIN_CFLAGS.sparc32  += -m32
diff --git a/debian/patches/11_find-glob.patch b/debian/patches/11_find-glob.patch
index ba7bd40..a07bd29 100644
--- a/debian/patches/11_find-glob.patch
+++ b/debian/patches/11_find-glob.patch
@@ -3,87 +3,16 @@ Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
 
 Last-Update: <2014-11-15>
 
---- kbuild-0.1.9998svn2734+dfsg.orig/src/kmk/configure.in
-+++ kbuild-0.1.9998svn2734+dfsg/src/kmk/configure.in
-@@ -357,7 +357,7 @@ AC_MSG_CHECKING(if system libc has GNU g
- AC_CACHE_VAL(make_cv_sys_gnu_glob, [
-  AC_EGREP_CPP(gnu glob,[
- #include <features.h>
--#include <glob.h>
-+#include "glob/glob.h"
- #include <fnmatch.h>
- 
- #define GLOB_INTERFACE_VERSION 1
---- kbuild-0.1.9998svn2734+dfsg.orig/src/kmk/expreval.c
-+++ kbuild-0.1.9998svn2734+dfsg/src/kmk/expreval.c
-@@ -30,7 +30,7 @@
- #include "make.h"
- #include <assert.h>
- 
--#include <glob.h>
-+#include "glob/glob.h"
- 
- #include "dep.h"
- #include "filedef.h"
---- kbuild-0.1.9998svn2734+dfsg.orig/src/kmk/glob/glob.c
-+++ kbuild-0.1.9998svn2734+dfsg/src/kmk/glob/glob.c
-@@ -25,7 +25,7 @@ USA.  */
- # include <config.h>
+diff --git a/src/kmk/dir.c b/src/kmk/dir.c
+index 2bef610..2c39119 100644
+--- a/src/kmk/dir.c
++++ b/src/kmk/dir.c
+@@ -1449,7 +1449,7 @@ dir_setup_glob (glob_t *gl)
+ #ifdef __EMX__ /* The FreeBSD implementation actually uses gl_lstat!! */
+   gl->gl_lstat = local_stat;
  #endif
- 
--/* Enable GNU extensions in glob.h.  */
-+/* Enable GNU extensions in "glob.h".  */
- #ifndef _GNU_SOURCE
- # define _GNU_SOURCE	1
+-#if defined(KMK) && !defined(__OS2__)
++#if defined(WINDOWS32) && defined(KMK) && !defined(__OS2__)
+   gl->gl_exists = file_exists_p;
+   gl->gl_isdir = dir_exists_p;
  #endif
-@@ -271,7 +271,7 @@ extern char *alloca ();
- #include <fnmatch.h>
- 
- /* Some system header files erroneously define these.
--   We want our own definitions from <glob.h> to take precedence.  */
-+   We want our own definitions from "glob.h" to take precedence.  */
- #ifndef __GNU_LIBRARY__
- # undef	GLOB_ERR
- # undef	GLOB_MARK
-@@ -282,7 +282,7 @@ extern char *alloca ();
- # undef	GLOB_NOESCAPE
- # undef	GLOB_PERIOD
- #endif
--#include <glob.h>
-+#include "glob.h"
- 
- #ifdef HAVE_GETLOGIN_R
- extern int getlogin_r __P ((char *, size_t));
---- kbuild-0.1.9998svn2734+dfsg.orig/src/kmk/incdep.c
-+++ kbuild-0.1.9998svn2734+dfsg/src/kmk/incdep.c
-@@ -40,7 +40,7 @@
- 
- #include <assert.h>
- 
--#include <glob.h>
-+#include "glob/glob.h"
- 
- #include "dep.h"
- #include "filedef.h"
---- kbuild-0.1.9998svn2734+dfsg.orig/src/kmk/kdepdb.c
-+++ kbuild-0.1.9998svn2734+dfsg/src/kmk/kdepdb.c
-@@ -30,7 +30,7 @@
- #include "../lib/k/kDefs.h"
- #include "../lib/k/kTypes.h"
- #include <assert.h>
--#include <glob.h>
-+#include "glob/glob.h"
- 
- #include "dep.h"
- #include "filedef.h"
---- kbuild-0.1.9998svn2734+dfsg.orig/src/kmk/read.c
-+++ kbuild-0.1.9998svn2734+dfsg/src/kmk/read.c
-@@ -20,7 +20,7 @@ this program.  If not, see <http://www.g
- 
- #include <assert.h>
- 
--#include <glob.h>
-+#include "glob/glob.h"
- 
- #include "dep.h"
- #include "filedef.h"
diff --git a/debian/patches/12_arm64.diff b/debian/patches/12_arm64.diff
index ce12944..ff2e1a3 100644
--- a/debian/patches/12_arm64.diff
+++ b/debian/patches/12_arm64.diff
@@ -2,7 +2,7 @@ Description: Add arm64 to supported architectures
 --- a/kBuild/env.sh
 +++ b/kBuild/env.sh
 @@ -372,6 +372,9 @@
-         arm|armv4l|armv5tel|armv5tejl|armv7l)
+         armv3l|armv4b|armv4l|armv4tl|armv5tel|armv5tejl|armv6l|armv7l|armv7hl|armv7hnl)
              KBUILD_HOST_ARCH='arm'
              ;;
 +        aarch64)
diff --git a/debian/patches/series b/debian/patches/series
index d4a154e..dfc36e8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,7 +4,7 @@
 05_hppa-disable-threads.diff
 06_binutils-gold.diff
 07_special-chars-build-path.diff
-08_no_o3_optimization.diff
+#08_no_o3_optimization.diff
 09_read.c_record_files_SV_33034_Changes_fatal_to_error.patch
 10_ppc64el.diff
 11_find-glob.patch

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

