Noux: fix the 'xxd' program

Fixes #1064.
This commit is contained in:
Christian Prochaska 2014-02-14 16:08:49 +01:00 committed by Norman Feske
parent f74c70ec05
commit 1ac034d16d
2 changed files with 37 additions and 1 deletions

View File

@ -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

View File

@ -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