summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Geyer <debfx-pkg@fobos.de>2011-08-21 18:25:13 +0200
committerFelix Geyer <debfx-pkg@fobos.de>2011-08-21 18:25:13 +0200
commit2726747ba7da97f4c8c76a064cebd7bdbf655142 (patch)
treeb34b7686416b54e2ca6f12946295d8aa9e0895cc
parent821abc3b27efba9c3a78ac5a34ebccdeb8b2f2ce (diff)
downloadkbuild-2726747ba7da97f4c8c76a064cebd7bdbf655142.tar.gz
Fix 06_binutils-gold.diff for the new upstream version.
-rw-r--r--debian/patches/06_binutils-gold.diff18
1 files changed, 9 insertions, 9 deletions
diff --git a/debian/patches/06_binutils-gold.diff b/debian/patches/06_binutils-gold.diff
index 6de402d..4ffa79f 100644
--- a/debian/patches/06_binutils-gold.diff
+++ b/debian/patches/06_binutils-gold.diff
@@ -4,16 +4,16 @@ Bug-Debian: http://bugs.debian.org/554937
--- a/src/kmk/Makefile.kmk
+++ b/src/kmk/Makefile.kmk
-@@ -230,6 +230,12 @@ kmk_SOURCES = \
- kmk_DEFS.hppa32 = CONFIG_WITHOUT_THREADS
- kmk_DEFS.hppa64 = CONFIG_WITHOUT_THREADS
+@@ -273,6 +273,12 @@ kmk_SOURCES += \
+ ##kmk_DEFS += KMK_PRF=1
+ ##kmkmissing_DEFS += KMK_PRF=1
+ifeq ($(KBUILD_TARGET), linux)
-+ ifn1of ($(KBUILD_TARGET_ARCH), hppa32 hppa64)
-+ kmk_LIBS += pthread
-+ endif
++ ifn1of ($(KBUILD_TARGET_ARCH), hppa32 hppa64)
++ TEMPLATE_BIN-THREADED_LIBS = pthread
++ endif
+endif
+
- kmk_DEFS.gnukfreebsd = CONFIG_WITHOUT_THREADS
- kmk_DEFS.freebsd.x86 = CONFIG_WITHOUT_THREADS
-
+ #
+ # Standalone kmkbuiltin commands.
+ #