From eccc53965130157be5abae8c8c4cb60dab86c5c2 Mon Sep 17 00:00:00 2001
From: Christian Helmuth <christian.helmuth@genode-labs.com>
Date: Wed, 25 Jan 2017 13:03:51 +0100
Subject: [PATCH] noux-pkg/less: use LIBS when building tools

lesskey and lessecho missed the declaration of ${LIBS} on the compiler
command line, which ended up in unusable programs.

  > file noux-pkg/less/lesskey.broken
  noux-pkg/less/lesskey.broken: ELF 32-bit LSB executable, Intel 80386, version 1 (SYSV), dynamically linked, interpreter *empty*, not stripped
  > file noux-pkg/less/lesskey
  noux-pkg/less/lesskey: ELF 32-bit LSB executable, Intel 80386, version 1 (SYSV), dynamically linked, interpreter ld.lib.so, not stripped

The issue was identified because -O0 builds broke with

  ld: lesskey: The first section in the PT_DYNAMIC segment is not the .dynamic section

Unfortunately, this simple fix renders both tools also dependent to libm
and ncurses which they don't use.
---
 repos/ports/ports/less.hash              |  2 +-
 repos/ports/ports/less.port              |  2 +-
 repos/ports/src/noux-pkg/less/libs.patch | 14 ++++++++++++++
 3 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 repos/ports/src/noux-pkg/less/libs.patch

diff --git a/repos/ports/ports/less.hash b/repos/ports/ports/less.hash
index 36e28ad86c..7d8fa572b0 100644
--- a/repos/ports/ports/less.hash
+++ b/repos/ports/ports/less.hash
@@ -1 +1 @@
-58e87934afd2c2ed0f9bc808f23d838bdf578f69
+c95e59f851e92a1f65e5332ce6fa2bf6ff3622bf
diff --git a/repos/ports/ports/less.port b/repos/ports/ports/less.port
index e236c7ebe8..7579fdf9bd 100644
--- a/repos/ports/ports/less.port
+++ b/repos/ports/ports/less.port
@@ -8,4 +8,4 @@ SIG(less) := ${URL(less)}.sig
 KEY(less) := GNU
 DIR(less) := src/noux-pkg/less
 
-PATCHES   := src/noux-pkg/less/tty_fd.patch
+PATCHES   := src/noux-pkg/less/tty_fd.patch src/noux-pkg/less/libs.patch
diff --git a/repos/ports/src/noux-pkg/less/libs.patch b/repos/ports/src/noux-pkg/less/libs.patch
new file mode 100644
index 0000000000..bb3d0edd83
--- /dev/null
+++ b/repos/ports/src/noux-pkg/less/libs.patch
@@ -0,0 +1,14 @@
++++ src/noux-pkg/less/Makefile.in
+@@ -57,10 +57,10 @@ less$(EXEEXT): ${OBJ}
+ 	${CC} ${LDFLAGS} -o $@ ${OBJ} ${LIBS}
+ 
+ lesskey$(EXEEXT): lesskey.${O} version.${O}
+-	${CC} ${LDFLAGS} -o $@ lesskey.${O} version.${O}
++	${CC} ${LDFLAGS} -o $@ lesskey.${O} version.${O} ${LIBS}
+ 
+ lessecho$(EXEEXT): lessecho.${O} version.${O}
+-	${CC} ${LDFLAGS} -o $@ lessecho.${O} version.${O}
++	${CC} ${LDFLAGS} -o $@ lessecho.${O} version.${O} ${LIBS}
+ 
+ ${OBJ}: ${srcdir}/less.h ${srcdir}/funcs.h defines.h 
+