Refresh patches.

5 files changed, 26 insertions, 20 deletions

diff --git a/debian/changelog b/debian/changelog
index 0fc5d54..d6e85e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 kbuild (1:0.1.9998svn2543-1) UNRELEASED; urgency=low
 
   * New upstream snapshot.
+  * Refresh patches.
   * Switch to source format 3.0 (quilt).
     - Add unapply-patches and abort-on-upstream-changes to local-options.
   * Convert package from cdbs to dh(1).
diff --git a/debian/patches/01_gnukfreebsd.diff b/debian/patches/01_gnukfreebsd.diff
index 5184cc4..090cf50 100644
--- a/debian/patches/01_gnukfreebsd.diff
+++ b/debian/patches/01_gnukfreebsd.diff
@@ -243,11 +243,11 @@ Index: kbuild-0.1.98svn2318/src/ash/Makefile.kmk
 +	HAVE_SYSCTL_H
  kmk_ash_DEFS.freebsd = \
  	HAVE_SYS_SIGNAME HAVE_SYSCTL_H HAVE_SETPROGNAME
- kmk_ash_INCS = $(PATH_kmk_ash) . # (the last is because of error.h)
+ kmk_ash_DEFS.openbsd = \
 @@ -79,6 +81,10 @@
- 	$(PATH_kmk_ash)/builtins.c \
- 	$(PATH_kmk_ash)/init.c \
- 	$(PATH_kmk_ash)/nodes.c
+ 	$(kmk_ash_0_OUTDIR)/builtins.c \
+ 	$(kmk_ash_0_OUTDIR)/init.c \
+ 	$(kmk_ash_0_OUTDIR)/nodes.c
 +kmk_ash_SOURCES.gnukfreebsd = \
 +	sys_signame.c \
 +	strlcpy.c \
@@ -267,7 +267,7 @@ Index: kbuild-0.1.98svn2318/src/kash/Makefile.kmk
 +	HAVE_SYSCTL_H
  kash_DEFS.freebsd = \
  	HAVE_SYS_SIGNAME HAVE_SYSCTL_H HAVE_SETPROGNAME
- kash_INCS = $(PATH_kash) . # (the last is because of error.h)
+ kash_DEFS.openbsd = \
 @@ -96,6 +98,9 @@
  	shheap.c \
  	shthread.c \
@@ -320,15 +320,14 @@ Index: kbuild-0.1.98svn2318/src/kmk/Makefile.kmk
  kmkmissing_SOURCES.linux += \
  	kmkbuiltin/strlcpy.c
 
-@@ -218,7 +221,8 @@
- #kmk_LIBS.solaris = malloc
- #kmk_DEFS.solaris += HAVE_MALLINFO
-
+@@ -218,6 +221,7 @@
+ 	vpath.c \
+ 	remote-stub.c
+ 
 +kmk_DEFS.gnukfreebsd = CONFIG_WITHOUT_THREADS
- kmk_LIBS.freebsd.amd64 = pthread
  kmk_DEFS.freebsd.x86 = CONFIG_WITHOUT_THREADS
-
- #
+ 
+ #kmk_LIBS.solaris = malloc
 Index: kbuild-0.1.98svn2318/src/kmk/file.c
 ===================================================================
 --- kbuild-0.1.98svn2318.orig/src/kmk/file.c	2009-08-06 18:51:39.000000000 +0200
diff --git a/debian/patches/05_hppa-disable-threads.diff b/debian/patches/05_hppa-disable-threads.diff
index d9bc8ec..d3ee072 100644
--- a/debian/patches/05_hppa-disable-threads.diff
+++ b/debian/patches/05_hppa-disable-threads.diff
@@ -5,12 +5,12 @@ diff -Nur kbuild.orig/src/kmk/Makefile.kmk kbuild/src/kmk/Makefile.kmk
 --- kbuild.orig/src/kmk/Makefile.kmk	2010-05-03 13:59:59.000000000 +0200
 +++ kbuild/src/kmk/Makefile.kmk	2010-05-03 14:28:01.815287097 +0200
 @@ -221,6 +221,9 @@
- #kmk_LIBS.solaris = malloc
- #kmk_DEFS.solaris += HAVE_MALLINFO
+ 	vpath.c \
+ 	remote-stub.c
  
 +kmk_DEFS.hppa32 = CONFIG_WITHOUT_THREADS
 +kmk_DEFS.hppa64 = CONFIG_WITHOUT_THREADS
 +
  kmk_DEFS.gnukfreebsd = CONFIG_WITHOUT_THREADS
- kmk_LIBS.freebsd.amd64 = pthread
  kmk_DEFS.freebsd.x86 = CONFIG_WITHOUT_THREADS
+ 
diff --git a/debian/patches/06_binutils-gold.diff b/debian/patches/06_binutils-gold.diff
index fbaf563..10f4063 100644
--- a/debian/patches/06_binutils-gold.diff
+++ b/debian/patches/06_binutils-gold.diff
@@ -16,5 +16,5 @@ diff -Nur kbuild.orig/src/kmk/Makefile.kmk kbuild/src/kmk/Makefile.kmk
 +endif
 +
  kmk_DEFS.gnukfreebsd = CONFIG_WITHOUT_THREADS
- kmk_LIBS.freebsd.amd64 = pthread
  kmk_DEFS.freebsd.x86 = CONFIG_WITHOUT_THREADS
+ 
diff --git a/debian/patches/07_special-chars-build-path.diff b/debian/patches/07_special-chars-build-path.diff
index 5d2818b..a049ec4 100644
--- a/debian/patches/07_special-chars-build-path.diff
+++ b/debian/patches/07_special-chars-build-path.diff
@@ -15,7 +15,7 @@ diff -Nur kbuild-0.1.98svn2318.orig/kBuild/tools/GCC32.kmk kbuild-0.1.98svn2318/
  TOOL_GCC32_LD  ?= gcc$(HOSTSUFF_EXE) -m32
  TOOL_GCC32_LD_SYSMOD ?= ld$(HOSTSUFF_EXE)
  ifndef TOOL_GCC32_LDFLAGS.$(KBUILD_TARGET)
-@@ -214,17 +215,21 @@
+@@ -214,20 +215,21 @@
  # @param    $(deps)		Other dependencies.
  # @param    $(othersrc) Unhandled sources.
  # @param    $(outbase)  Output basename (full). Use this for list files and such.
@@ -27,7 +27,10 @@ diff -Nur kbuild-0.1.98svn2318.orig/kBuild/tools/GCC32.kmk kbuild-0.1.98svn2318/
 -	$(QUIET)$(APPEND) $(out).ar-script 'CREATE $(out)'
 -	$(QUIET)$(APPEND) -n $(out).ar-script \
 -		$(foreach o,$(objs), 'ADDMOD $(o)') \
--		$(foreach o,$(othersrc), 'ADDLIB $(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))\
+-		 $(NL)$(TAB)$(QUIET)$(APPEND) $(out).ar-script 'ADDLIB $(outbase).imp.a')
 -	$(QUIET)$(APPEND) $(out).ar-script 'SAVE'
 -	$(QUIET)$(APPEND) $(out).ar-script 'END'
 -	$(QUIET)$(REDIRECT) -rti $(out).ar-script -- $(TOOL_GCC32_AR) -M
@@ -142,7 +145,7 @@ diff -Nur kbuild-0.1.98svn2318.orig/kBuild/tools/GXX32.kmk kbuild-0.1.98svn2318/
  TOOL_GXX32_LD  ?= g++$(HOSTSUFF_EXE) -m32
  TOOL_GXX32_LD_SYSMOD ?= ld$(HOSTSUFF_EXE)
  ifndef TOOL_GXX32_LDFLAGS.$(KBUILD_TARGET)
-@@ -213,17 +214,21 @@
+@@ -213,20 +214,21 @@
  # @param    $(deps)		Other dependencies.
  # @param    $(othersrc) Unhandled sources.
  # @param    $(outbase)  Output basename (full). Use this for list files and such.
@@ -154,7 +157,10 @@ diff -Nur kbuild-0.1.98svn2318.orig/kBuild/tools/GXX32.kmk kbuild-0.1.98svn2318/
 -	$(QUIET)$(APPEND) $(out).ar-script 'CREATE $(out)'
 -	$(QUIET)$(APPEND) -n $(out).ar-script \
 -		$(foreach o,$(objs), 'ADDMOD $(o)') \
--		$(foreach o,$(othersrc), 'ADDLIB $(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))\
+-		 $(NL)$(TAB)$(QUIET)$(APPEND) $(out).ar-script 'ADDLIB $(outbase).imp.a')
 -	$(QUIET)$(APPEND) $(out).ar-script 'SAVE'
 -	$(QUIET)$(APPEND) $(out).ar-script 'END'
 -	$(QUIET)$(REDIRECT) -rti $(out).ar-script -- $(TOOL_GXX32_AR) -M