From 1ac034d16d7675d0511b2d91c4785497a66665a2 Mon Sep 17 00:00:00 2001
From: Christian Prochaska <christian.prochaska@genode-labs.com>
Date: Fri, 14 Feb 2014 16:08:49 +0100
Subject: [PATCH] Noux: fix the 'xxd' program

Fixes #1064.
---
 ports/ports/vim.mk                 |  2 +-
 ports/src/noux-pkg/vim/build.patch | 36 ++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 ports/src/noux-pkg/vim/build.patch

diff --git a/ports/ports/vim.mk b/ports/ports/vim.mk
index d385bf02f..efd4ea3d5 100644
--- a/ports/ports/vim.mk
+++ b/ports/ports/vim.mk
@@ -39,4 +39,4 @@ $(CONTRIB_DIR)/$(VIM): $(DOWNLOAD_DIR)/$(VIM_TBZ2).verified
 	@# environment
 	@#
 	$(VERBOSE)sed -i "/default_vim_dir/s/.(VIMRCLOC)/\/share\/vim/" $@/src/Makefile
-
+	$(VERBOSE)patch -d $(CONTRIB_DIR)/$(VIM) -N -p1 < src/noux-pkg/vim/build.patch
diff --git a/ports/src/noux-pkg/vim/build.patch b/ports/src/noux-pkg/vim/build.patch
new file mode 100644
index 000000000..4191db9c0
--- /dev/null
+++ b/ports/src/noux-pkg/vim/build.patch
@@ -0,0 +1,36 @@
+build.patch
+
+From: Christian Prochaska <christian.prochaska@genode-labs.com>
+
+
+---
+ src/Makefile     |    2 +-
+ src/xxd/Makefile |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index e473ca2..52b75e4 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -1698,7 +1698,7 @@ $(VIMTARGET): auto/config.mk objects $(OBJ) version.c version.h
+ 		MAKE="$(MAKE)" sh $(srcdir)/link.sh
+ 
+ xxd/xxd$(EXEEXT): xxd/xxd.c
+-	cd xxd; CC="$(CC)" CFLAGS="$(CPPFLAGS) $(CFLAGS)" \
++	cd xxd; CC="$(CC)" CFLAGS="$(CPPFLAGS) $(CFLAGS)" LDFLAGS="$(LDFLAGS)" LIBS="$(LIBS)" \
+ 		$(MAKE) -f Makefile
+ 
+ # Build the language specific files if they were unpacked.
+diff --git a/src/xxd/Makefile b/src/xxd/Makefile
+index 97bbcc7..099330a 100644
+--- a/src/xxd/Makefile
++++ b/src/xxd/Makefile
+@@ -1,7 +1,7 @@
+ # The most simplistic Makefile
+ 
+ xxd: xxd.c
+-	$(CC) $(CFLAGS) $(LDFLAGS) -DUNIX -o xxd xxd.c
++	$(CC) $(CFLAGS) $(LDFLAGS) -DUNIX -o xxd xxd.c $(LIBS)
+ 
+ clean:
+ 	rm -f xxd xxd.o