[Pkg-virtualbox-commits] [kbuild] 04/05: Add patch to make it build with the correct glob implementation

Gianfranco Costamagna locutusofborg-guest at moszumanska.debian.org
Thu Dec 4 10:17:31 UTC 2014


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

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

commit 3154583965a7ca5863281364254d53f7bfd0caa1
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Sat Nov 15 13:42:04 2014 +0100

    Add patch to make it build with the correct glob implementation
---
 debian/patches/11_find-glob.patch | 100 ++++++++++++++++++++++++++++++++++++++
 debian/patches/series             |   1 +
 2 files changed, 101 insertions(+)

diff --git a/debian/patches/11_find-glob.patch b/debian/patches/11_find-glob.patch
new file mode 100644
index 0000000..329a913
--- /dev/null
+++ b/debian/patches/11_find-glob.patch
@@ -0,0 +1,100 @@
+Description: Avoid build failures by finding the correct glob.h header
+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/dir.c
++++ kbuild-0.1.9998svn2734+dfsg/src/kmk/dir.c
+@@ -1310,7 +1310,7 @@ print_dir_data_base (void)
+ 

+ /* Hooks for globbing.  */
+ 
+-#include <glob.h>
++#include "glob/glob.h"
+ 
+ /* Structure describing state of iterating through a directory hash table.  */
+ 
+--- 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>
+ #endif
+ 
+-/* Enable GNU extensions in glob.h.  */
++/* Enable GNU extensions in "glob.h".  */
+ #ifndef _GNU_SOURCE
+ # define _GNU_SOURCE	1
+ #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/series b/debian/patches/series
index 55bf67f..0cf2efb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@
 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



More information about the Pkg-virtualbox-commits mailing list