ncurses: add SYSROOT to --libdir option

fixes problem with new toolchains and alsa-utils.

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
(cherry picked from commit 7c0b5a6f83e3225fc182c6376a3845804a1a252f)

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

3 files changed, 34 insertions, 17 deletions

diff --git a/patches/ncurses-5.6/remove-tool-deps.diff b/patches/ncurses-5.6/0001-remove-tools-build-dependency.patch
index f27731264..600690bf7 100644
--- a/patches/ncurses-5.6/remove-tool-deps.diff
+++ b/patches/ncurses-5.6/0001-remove-tools-build-dependency.patch
@@ -1,19 +1,19 @@
-Subject: remove tools build dependency
 From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Thu, 17 Mar 2011 13:34:53 +0100
+Subject: [PATCH] remove tools build dependency
 
 make_keys is built as host tool and copied to the real package.
 This patch makes sure that it is not rebuilt again.
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-
 ---
 # 20081125: wsa: HACK: Not for upstream.
 
  ncurses/Makefile.in |    3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
+ 1 files changed, 1 insertions(+), 2 deletions(-)
 
-Index: b/ncurses/Makefile.in
-===================================================================
+diff --git a/ncurses/Makefile.in b/ncurses/Makefile.in
+index ce35c03..0e2b08d 100644
 --- a/ncurses/Makefile.in
 +++ b/ncurses/Makefile.in
 @@ -189,7 +189,7 @@ $(DESTDIR)$(libdir) :
@@ -33,3 +33,6 @@ Index: b/ncurses/Makefile.in
  		../include/hashsize.h \
  		$(tinfo)/MKcaptab.awk
  	sh $(tinfo)/MKcaptab.awk $(AWK) $(srcdir)/../include/@TERMINFO_CAPS@ > $@
+-- 
+1.7.2.3
+
diff --git a/patches/ncurses-5.6/ncurses-config-add-sysroot.diff b/patches/ncurses-5.6/0002-teach-ncurses-config-about-sysroot.patch
index 3c2f928cb..b6405617f 100644
--- a/patches/ncurses-5.6/ncurses-config-add-sysroot.diff
+++ b/patches/ncurses-5.6/0002-teach-ncurses-config-about-sysroot.patch
@@ -1,18 +1,18 @@
-Subject: teach ncurses-config about sysroot
 From: Marc Kleine-Budde <mkl@pengutronix.de>
+Date: Thu, 17 Mar 2011 13:34:53 +0100
+Subject: [PATCH] teach ncurses-config about sysroot
 
-This patch teaches ncursrs-config about sysroot
-
-Signed-off-by: Marc Kleine-Buddde <mkl@pengutronix.de>
+This patch teaches ncurses-config about sysroot
 
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 ---
- misc/ncurses-config.in |    8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
+ misc/ncurses-config.in |   10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
 
-Index: ncurses-5.6/misc/ncurses-config.in
-===================================================================
---- ncurses-5.6.orig/misc/ncurses-config.in
-+++ ncurses-5.6/misc/ncurses-config.in
+diff --git a/misc/ncurses-config.in b/misc/ncurses-config.in
+index 1da156c..25c7858 100644
+--- a/misc/ncurses-config.in
++++ b/misc/ncurses-config.in
 @@ -70,11 +70,11 @@ while test $# -gt 0; do
  	# compile/link
  	--cflags)
@@ -37,3 +37,15 @@ Index: ncurses-5.6/misc/ncurses-config.in
  ENDECHO
  		;;
  	# identification
+@@ -103,7 +103,7 @@ ENDECHO
+ 		echo "${datadir}"
+ 		;;
+ 	--libdir)
+-		echo "${libdir}"
++		echo "${SYSROOT}${libdir}"
+ 		;;
+ 	--mandir)
+ 		echo "${mandir}"
+-- 
+1.7.2.3
+
diff --git a/patches/ncurses-5.6/series b/patches/ncurses-5.6/series
index c0282a5a9..328caff29 100644
--- a/patches/ncurses-5.6/series
+++ b/patches/ncurses-5.6/series
@@ -1,2 +1,4 @@
-remove-tool-deps.diff
-ncurses-config-add-sysroot.diff
+# generated by git-ptx-patches
+0001-remove-tools-build-dependency.patch
+0002-teach-ncurses-config-about-sysroot.patch
+# 03b7e5456ca8d5d7006a5c85c9a037d9  - git-ptx-patches magic