[Pkg-virtualbox-commits] [kbuild] 03/03: Patch refresh
Gianfranco Costamagna
locutusofborg-guest at moszumanska.debian.org
Tue Apr 28 19:01:24 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 44ea05d54fb853b3d4c451dc0fcbc28da3c77fc9
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Mon Apr 27 09:51:57 2015 +0200
Patch refresh
---
debian/changelog | 6 ++++++
debian/patches/01_gnukfreebsd.diff | 12 +++++------
debian/patches/05_hppa-disable-threads.diff | 6 +++---
debian/patches/06_binutils-gold.diff | 2 +-
debian/patches/07_special-chars-build-path.diff | 24 +++++++++++-----------
...ord_files_SV_33034_Changes_fatal_to_error.patch | 2 +-
debian/patches/11_find-glob.patch | 11 ----------
7 files changed, 29 insertions(+), 34 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 32a8add..784f03a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+kbuild (1:0.1.9998svn2780+dfsg-1) UNRELEASED; urgency=medium
+
+ * New upstream snapshot, patch refresh.
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it> Mon, 27 Apr 2015 00:42:00 +0200
+
kbuild (1:0.1.9998svn2745+dfsg-1) experimental; urgency=medium
[ Gianfranco Costamagna ]
diff --git a/debian/patches/01_gnukfreebsd.diff b/debian/patches/01_gnukfreebsd.diff
index 03a1197..de250d3 100644
--- a/debian/patches/01_gnukfreebsd.diff
+++ b/debian/patches/01_gnukfreebsd.diff
@@ -59,7 +59,7 @@ Bug-Debian: http://bugs.debian.org/540665
# include <sys/mman.h>
--- a/src/kmk/main.c
+++ b/src/kmk/main.c
-@@ -48,7 +48,7 @@ this program. If not, see <http://www.g
+@@ -51,7 +51,7 @@ this program. If not, see <http://www.g
#endif
#ifdef KMK /* for get_online_cpu_count */
@@ -145,7 +145,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
KBUILD_ARCHES_64 := amd64 sparc64 s390x ppc64 mips64 ia64 hppa64 alpha
KBUILD_ARCHES_32 := x86 sparc32 s390 ppc32 mips32 hppa32 arm
-@@ -565,7 +565,7 @@ else ifeq ($(KBUILD_HOST),os2)
+@@ -566,7 +566,7 @@ else ifeq ($(KBUILD_HOST),os2)
EXEC_X86_WIN32 := innopec.exe
HOSTSUFF_EXE := .exe
@@ -154,7 +154,7 @@ Bug-Debian: http://bugs.debian.org/540665
# Unix (like) systems with wine.
EXEC_X86_WIN32 := wine
HOSTSUFF_EXE :=
-@@ -609,7 +609,7 @@ SUFF_OBJ := .o
+@@ -610,7 +610,7 @@ SUFF_OBJ := .o
SUFF_LIB := .a
SUFF_DLL := .so
SUFF_EXE :=
@@ -260,9 +260,9 @@ Bug-Debian: http://bugs.debian.org/540665
kmkmissing_SOURCES.linux += \
kmkbuiltin/strlcpy.c
-@@ -231,6 +234,7 @@ kmk_SOURCES = \
- vpath.c \
- remote-stub.c
+@@ -237,6 +240,7 @@ kmk_SOURCES = \
+ kbuild.c \
+ kbuild-object.c
+kmk_DEFS.gnukfreebsd = CONFIG_WITHOUT_THREADS
kmk_DEFS.freebsd.x86 = CONFIG_WITHOUT_THREADS
diff --git a/debian/patches/05_hppa-disable-threads.diff b/debian/patches/05_hppa-disable-threads.diff
index 93c95dd..b874668 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
-@@ -234,6 +234,9 @@ kmk_SOURCES = \
- vpath.c \
- remote-stub.c
+@@ -240,6 +240,9 @@ kmk_SOURCES = \
+ kbuild.c \
+ kbuild-object.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 f118979..cf91977 100644
--- a/debian/patches/06_binutils-gold.diff
+++ b/debian/patches/06_binutils-gold.diff
@@ -4,7 +4,7 @@ Bug-Debian: http://bugs.debian.org/554937
--- a/src/kmk/Makefile.kmk
+++ b/src/kmk/Makefile.kmk
-@@ -280,6 +280,12 @@ kmk_SOURCES += \
+@@ -286,6 +286,12 @@ kmk_SOURCES += \
##kmk_DEFS += KMK_PRF=1
##kmkmissing_DEFS += KMK_PRF=1
diff --git a/debian/patches/07_special-chars-build-path.diff b/debian/patches/07_special-chars-build-path.diff
index 2d527fd..54fff0f 100644
--- a/debian/patches/07_special-chars-build-path.diff
+++ b/debian/patches/07_special-chars-build-path.diff
@@ -26,9 +26,9 @@ Bug: http://svn.netlabs.org/kbuild/ticket/94
- $(QUIET)$(APPEND) $(out).ar-script 'CREATE $(out)'
- $(QUIET)$(APPEND) -n $(out).ar-script \
- $(foreach o,$(objs), 'ADDMOD $(o)') \
-- $(foreach o,$(filter-out %.def %.imp,$(othersrc)), 'ADDLIB $(o)')
-- $(if $(filter %.def %.imp,$(othersrc))\
-- ,$(TOOL_GCC32_AR_IMP) -o $(outbase).imp.a $(filter %.def %.imp,$(othersrc))\
+- $(foreach o,$(filter-out %.def %.imp %.dll,$(othersrc)), 'ADDLIB $(o)')
+- $(if $(filter %.def %.imp %.dll,$(othersrc))\
+- ,$(TOOL_GCC32_AR_IMP) -o $(outbase).imp.a $(filter %.def %.imp %.dll,$(othersrc))\
- $(NL)$(TAB)$(QUIET)$(APPEND) $(out).ar-script 'ADDLIB $(outbase).imp.a')
- $(QUIET)$(APPEND) $(out).ar-script 'SAVE'
- $(QUIET)$(APPEND) $(out).ar-script 'END'
@@ -70,9 +70,9 @@ Bug: http://svn.netlabs.org/kbuild/ticket/94
- $(QUIET)$(APPEND) $(out).ar-script 'CREATE $(out)'
- $(QUIET)$(APPEND) -n $(out).ar-script \
- $(foreach o,$(objs), 'ADDMOD $(o)') \
-- $(foreach o,$(filter-out %.def %.imp,$(othersrc)), 'ADDLIB $(o)')
-- $(if $(filter %.def %.imp,$(othersrc))\
-- ,$(TOOL_GCC3_AR_IMP) -o $(outbase).imp.a $(filter %.def %.imp,$(othersrc))\
+- $(foreach o,$(filter-out %.def %.imp %.dll,$(othersrc)), 'ADDLIB $(o)')
+- $(if $(filter %.def %.imp %.dll,$(othersrc))\
+- ,$(TOOL_GCC3_AR_IMP) -o $(outbase).imp.a $(filter %.def %.imp %.dll,$(othersrc))\
- $(NL)$(TAB)$(QUIET)$(APPEND) $(out).ar-script 'ADDLIB $(outbase).imp.a')
- $(QUIET)$(APPEND) $(out).ar-script 'SAVE'
- $(QUIET)$(APPEND) $(out).ar-script 'END'
@@ -153,9 +153,9 @@ Bug: http://svn.netlabs.org/kbuild/ticket/94
- $(QUIET)$(APPEND) $(out).ar-script 'CREATE $(out)'
- $(QUIET)$(APPEND) -n $(out).ar-script \
- $(foreach o,$(objs), 'ADDMOD $(o)') \
-- $(foreach o,$(filter-out %.def %.imp,$(othersrc)), 'ADDLIB $(o)')
-- $(if $(filter %.def %.imp,$(othersrc))\
-- ,$(TOOL_GXX3_AR_IMP) -o $(outbase).imp.a $(filter %.def %.imp,$(othersrc))\
+- $(foreach o,$(filter-out %.def %.imp %.dll,$(othersrc)), 'ADDLIB $(o)')
+- $(if $(filter %.def %.imp %.dll,$(othersrc))\
+- ,$(TOOL_GXX3_AR_IMP) -o $(outbase).imp.a $(filter %.def %.imp %.dll,$(othersrc))\
- $(NL)$(TAB)$(QUIET)$(APPEND) $(out).ar-script 'ADDLIB $(outbase).imp.a')
- $(QUIET)$(APPEND) $(out).ar-script 'SAVE'
- $(QUIET)$(APPEND) $(out).ar-script 'END'
@@ -197,9 +197,9 @@ Bug: http://svn.netlabs.org/kbuild/ticket/94
- $(QUIET)$(APPEND) $(out).ar-script 'CREATE $(out)'
- $(QUIET)$(APPEND) -n $(out).ar-script \
- $(foreach o,$(objs), 'ADDMOD $(o)') \
-- $(foreach o,$(filter-out %.def %.imp,$(othersrc)), 'ADDLIB $(o)')
-- $(if $(filter %.def %.imp,$(othersrc))\
-- ,$(TOOL_GXX3_AR_IMP) -o $(outbase).imp.a $(filter %.def %.imp,$(othersrc))\
+- $(foreach o,$(filter-out %.def %.imp %.dll,$(othersrc)), 'ADDLIB $(o)')
+- $(if $(filter %.def %.imp %.dll,$(othersrc))\
+- ,$(TOOL_GXX3_AR_IMP) -o $(outbase).imp.a $(filter %.def %.imp %.dll,$(othersrc))\
- $(NL)$(TAB)$(QUIET)$(APPEND) $(out).ar-script 'ADDLIB $(outbase).imp.a')
- $(QUIET)$(APPEND) $(out).ar-script 'SAVE'
- $(QUIET)$(APPEND) $(out).ar-script 'END'
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 98257c9..caf5c11 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
-@@ -2746,7 +2746,7 @@ l_next:
+@@ -2756,7 +2756,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/11_find-glob.patch b/debian/patches/11_find-glob.patch
index 97d6cb5..ba7bd40 100644
--- a/debian/patches/11_find-glob.patch
+++ b/debian/patches/11_find-glob.patch
@@ -14,17 +14,6 @@ Last-Update: <2014-11-15>
#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 @@
--
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