Commit 44ea05d54fb853b3d4c451dc0fcbc28da3c77fc9 - kbuild

+6

-0

debian/changelog less more

	0	kbuild (1:0.1.9998svn2780+dfsg-1) UNRELEASED; urgency=medium
	1
	2	* New upstream snapshot, patch refresh.
	3
	4	-- Gianfranco Costamagna <costamagnagianfranco@yahoo.it> Mon, 27 Apr 2015 00:42:00 +0200
	5
0	6	kbuild (1:0.1.9998svn2745+dfsg-1) experimental; urgency=medium
1	7
2	8	[ Gianfranco Costamagna ]

+6

-6

debian/patches/01_gnukfreebsd.diff less more

58	58	# include <sys/mman.h>
59	59	--- a/src/kmk/main.c
60	60	+++ b/src/kmk/main.c
61		@@ -48,7 +48,7 @@ this program. If not, see <http://www.g
	61	@@ -51,7 +51,7 @@ this program. If not, see <http://www.g
62	62	#endif
63	63
64	64	#ifdef KMK /* for get_online_cpu_count */

144	144	KBUILD_ARCHES := x86 amd64 sparc32 sparc64 s390 s390x ppc32 ppc64 mips32 mips64 ia64 hppa32 hppa64 arm alpha
145	145	KBUILD_ARCHES_64 := amd64 sparc64 s390x ppc64 mips64 ia64 hppa64 alpha
146	146	KBUILD_ARCHES_32 := x86 sparc32 s390 ppc32 mips32 hppa32 arm
147		@@ -565,7 +565,7 @@ else ifeq ($(KBUILD_HOST),os2)
	147	@@ -566,7 +566,7 @@ else ifeq ($(KBUILD_HOST),os2)
148	148	EXEC_X86_WIN32 := innopec.exe
149	149	HOSTSUFF_EXE := .exe
150	150

153	153	# Unix (like) systems with wine.
154	154	EXEC_X86_WIN32 := wine
155	155	HOSTSUFF_EXE :=
156		@@ -609,7 +609,7 @@ SUFF_OBJ := .o
	156	@@ -610,7 +610,7 @@ SUFF_OBJ := .o
157	157	SUFF_LIB := .a
158	158	SUFF_DLL := .so
159	159	SUFF_EXE :=

259	259	kmkmissing_SOURCES.linux += \
260	260	kmkbuiltin/strlcpy.c
261	261
262		@@ -231,6 +234,7 @@ kmk_SOURCES = \
263		vpath.c \
264		remote-stub.c
	262	@@ -237,6 +240,7 @@ kmk_SOURCES = \
	263	kbuild.c \
	264	kbuild-object.c
265	265
266	266	+kmk_DEFS.gnukfreebsd = CONFIG_WITHOUT_THREADS
267	267	kmk_DEFS.freebsd.x86 = CONFIG_WITHOUT_THREADS

+3

-3

debian/patches/05_hppa-disable-threads.diff less more

2	2
3	3	--- a/src/kmk/Makefile.kmk
4	4	+++ b/src/kmk/Makefile.kmk
5		@@ -234,6 +234,9 @@ kmk_SOURCES = \
6		vpath.c \
7		remote-stub.c
	5	@@ -240,6 +240,9 @@ kmk_SOURCES = \
	6	kbuild.c \
	7	kbuild-object.c
8	8
9	9	+kmk_DEFS.hppa32 = CONFIG_WITHOUT_THREADS
10	10	+kmk_DEFS.hppa64 = CONFIG_WITHOUT_THREADS

+1

-1

debian/patches/06_binutils-gold.diff less more

3	3
4	4	--- a/src/kmk/Makefile.kmk
5	5	+++ b/src/kmk/Makefile.kmk
6		@@ -280,6 +280,12 @@ kmk_SOURCES += \
	6	@@ -286,6 +286,12 @@ kmk_SOURCES += \
7	7	##kmk_DEFS += KMK_PRF=1
8	8	##kmkmissing_DEFS += KMK_PRF=1
9	9

+12

-12

debian/patches/07_special-chars-build-path.diff less more

25	25	- $(QUIET)$(APPEND) $(out).ar-script 'CREATE $(out)'
26	26	- $(QUIET)$(APPEND) -n $(out).ar-script \
27	27	- $(foreach o,$(objs), 'ADDMOD $(o)') \
28		- $(foreach o,$(filter-out %.def %.imp,$(othersrc)), 'ADDLIB $(o)')
29		- $(if $(filter %.def %.imp,$(othersrc))\
30		- ,$(TOOL_GCC32_AR_IMP) -o $(outbase).imp.a $(filter %.def %.imp,$(othersrc))\
	28	- $(foreach o,$(filter-out %.def %.imp %.dll,$(othersrc)), 'ADDLIB $(o)')
	29	- $(if $(filter %.def %.imp %.dll,$(othersrc))\
	30	- ,$(TOOL_GCC32_AR_IMP) -o $(outbase).imp.a $(filter %.def %.imp %.dll,$(othersrc))\
31	31	- $(NL)$(TAB)$(QUIET)$(APPEND) $(out).ar-script 'ADDLIB $(outbase).imp.a')
32	32	- $(QUIET)$(APPEND) $(out).ar-script 'SAVE'
33	33	- $(QUIET)$(APPEND) $(out).ar-script 'END'

69	69	- $(QUIET)$(APPEND) $(out).ar-script 'CREATE $(out)'
70	70	- $(QUIET)$(APPEND) -n $(out).ar-script \
71	71	- $(foreach o,$(objs), 'ADDMOD $(o)') \
72		- $(foreach o,$(filter-out %.def %.imp,$(othersrc)), 'ADDLIB $(o)')
73		- $(if $(filter %.def %.imp,$(othersrc))\
74		- ,$(TOOL_GCC3_AR_IMP) -o $(outbase).imp.a $(filter %.def %.imp,$(othersrc))\
	72	- $(foreach o,$(filter-out %.def %.imp %.dll,$(othersrc)), 'ADDLIB $(o)')
	73	- $(if $(filter %.def %.imp %.dll,$(othersrc))\
	74	- ,$(TOOL_GCC3_AR_IMP) -o $(outbase).imp.a $(filter %.def %.imp %.dll,$(othersrc))\
75	75	- $(NL)$(TAB)$(QUIET)$(APPEND) $(out).ar-script 'ADDLIB $(outbase).imp.a')
76	76	- $(QUIET)$(APPEND) $(out).ar-script 'SAVE'
77	77	- $(QUIET)$(APPEND) $(out).ar-script 'END'

152	152	- $(QUIET)$(APPEND) $(out).ar-script 'CREATE $(out)'
153	153	- $(QUIET)$(APPEND) -n $(out).ar-script \
154	154	- $(foreach o,$(objs), 'ADDMOD $(o)') \
155		- $(foreach o,$(filter-out %.def %.imp,$(othersrc)), 'ADDLIB $(o)')
156		- $(if $(filter %.def %.imp,$(othersrc))\
157		- ,$(TOOL_GXX3_AR_IMP) -o $(outbase).imp.a $(filter %.def %.imp,$(othersrc))\
	155	- $(foreach o,$(filter-out %.def %.imp %.dll,$(othersrc)), 'ADDLIB $(o)')
	156	- $(if $(filter %.def %.imp %.dll,$(othersrc))\
	157	- ,$(TOOL_GXX3_AR_IMP) -o $(outbase).imp.a $(filter %.def %.imp %.dll,$(othersrc))\
158	158	- $(NL)$(TAB)$(QUIET)$(APPEND) $(out).ar-script 'ADDLIB $(outbase).imp.a')
159	159	- $(QUIET)$(APPEND) $(out).ar-script 'SAVE'
160	160	- $(QUIET)$(APPEND) $(out).ar-script 'END'

196	196	- $(QUIET)$(APPEND) $(out).ar-script 'CREATE $(out)'
197	197	- $(QUIET)$(APPEND) -n $(out).ar-script \
198	198	- $(foreach o,$(objs), 'ADDMOD $(o)') \
199		- $(foreach o,$(filter-out %.def %.imp,$(othersrc)), 'ADDLIB $(o)')
200		- $(if $(filter %.def %.imp,$(othersrc))\
201		- ,$(TOOL_GXX3_AR_IMP) -o $(outbase).imp.a $(filter %.def %.imp,$(othersrc))\
	199	- $(foreach o,$(filter-out %.def %.imp %.dll,$(othersrc)), 'ADDLIB $(o)')
	200	- $(if $(filter %.def %.imp %.dll,$(othersrc))\
	201	- ,$(TOOL_GXX3_AR_IMP) -o $(outbase).imp.a $(filter %.def %.imp %.dll,$(othersrc))\
202	202	- $(NL)$(TAB)$(QUIET)$(APPEND) $(out).ar-script 'ADDLIB $(outbase).imp.a')
203	203	- $(QUIET)$(APPEND) $(out).ar-script 'SAVE'
204	204	- $(QUIET)$(APPEND) $(out).ar-script 'END'

+1

-1

debian/patches/09_read.c_record_files_SV_33034_Changes_fatal_to_error.patch less more

43	43	index ebc6a63..9a326bb 100644
44	44	--- a/src/kmk/read.c
45	45	+++ b/src/kmk/read.c
46		@@ -2746,7 +2746,7 @@ l_next:
	46	@@ -2756,7 +2756,7 @@ l_next:
47	47	/* Reduce escaped percents. If there are any unescaped it's an error */
48	48	name = filenames->name;
49	49	if (find_percent_cached (&name))

+0

-11

debian/patches/11_find-glob.patch less more

13	13	#include <fnmatch.h>
14	14
15	15	#define GLOB_INTERFACE_VERSION 1
16		--- kbuild-0.1.9998svn2734+dfsg.orig/src/kmk/dir.c
17		+++ kbuild-0.1.9998svn2734+dfsg/src/kmk/dir.c
18		@@ -1310,7 +1310,7 @@ print_dir_data_base (void)
19
20		/* Hooks for globbing. */
21
22		-#include <glob.h>
23		+#include "glob/glob.h"
24
25		/* Structure describing state of iterating through a directory hash table. */
26
27	16	--- kbuild-0.1.9998svn2734+dfsg.orig/src/kmk/expreval.c
28	17	+++ kbuild-0.1.9998svn2734+dfsg/src/kmk/expreval.c
29	18	@@ -30,7 +30,7 @@