ncurses: 5.9 -> 6.0rbt/ncurses

Use -fPIC to fix when build readline: libtinfo.a(lib_termcap.o):
relocation R_X86_64_32 against `_nc_globals' can not be used when making
a shared object; recompile with -fPIC

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>

5 files changed, 18 insertions, 15 deletions

diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc
index ffd80ee7c7..ea18d41c94 100644
--- a/meta/recipes-core/ncurses/ncurses.inc
+++ b/meta/recipes-core/ncurses/ncurses.inc
@@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://ncurses/base/version.c;beginline=1;endline=27;md5=cbc
 SECTION = "libs"
 DEPENDS = "ncurses-native"
 DEPENDS_class-native = ""
-INC_PR = "r15"
 
 BINCONFIG = "${bindir}/ncurses-config"
 
@@ -83,7 +82,7 @@ ncurses_configure() {
 	        --enable-sigwinch \
 	        --enable-pc-files \
 	        --disable-rpath-hack \
-		${EXCONFIG_ARGS} \
+	        ${EXCONFIG_ARGS} \
 	        --with-manpage-format=normal \
 	        "$@" || return 1
 	cd ..
@@ -206,7 +205,7 @@ do_install() {
                 test -h $f || continue
                 rm -f $f
                 echo '/* GNU ld script */'  >$f
-                echo "INPUT($i.so.5 AS_NEEDED(-ltinfo))" >>$f
+                echo "INPUT($i.so.6 AS_NEEDED(-ltinfo))" >>$f
         done
 
         # Make sure that libcurses is linked so that it gets -ltinfo
@@ -304,3 +303,9 @@ FILES_${PN}-terminfo-base = "\
 
 RSUGGESTS_${PN}-libtinfo = "${PN}-terminfo"
 RRECOMMENDS_${PN}-libtinfo = "${PN}-terminfo-base"
+
+# Fixed when build readline:
+# libtinfo.a(lib_termcap.o): relocation R_X86_64_32 against
+# `_nc_globals' can not be used when making a shared object; recompile
+# with -fPIC
+CFLAGS_append = " -fPIC"
diff --git a/meta/recipes-core/ncurses/ncurses-5.9/config.cache b/meta/recipes-core/ncurses/ncurses/config.cache
index 6a9217d5bb..6a9217d5bb 100644
--- a/meta/recipes-core/ncurses/ncurses-5.9/config.cache
+++ b/meta/recipes-core/ncurses/ncurses/config.cache
diff --git a/meta/recipes-core/ncurses/ncurses-5.9/tic-hang.patch b/meta/recipes-core/ncurses/ncurses/tic-hang.patch
index cba89d26f5..cba89d26f5 100644
--- a/meta/recipes-core/ncurses/ncurses-5.9/tic-hang.patch
+++ b/meta/recipes-core/ncurses/ncurses/tic-hang.patch
diff --git a/meta/recipes-core/ncurses/ncurses_5.9.bb b/meta/recipes-core/ncurses/ncurses_5.9.bb
deleted file mode 100644
index 54d27a951b..0000000000
--- a/meta/recipes-core/ncurses/ncurses_5.9.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require ncurses.inc
-
-REVISION = "20150329"
-
-PR = "${INC_PR}.1"
-
-SRC_URI += "file://tic-hang.patch \
-            file://config.cache \
-"
-S = "${WORKDIR}/${BP}-${REVISION}"
-SRC_URI[md5sum] = "cee991d09e69e60ebedef424804c52d4"
-SRC_URI[sha256sum] = "5b64f40e4dce73e3aa83d15bd9257c6eff8790ec41150f0938bd87c0eb75828f"
diff --git a/meta/recipes-core/ncurses/ncurses_6.0.bb b/meta/recipes-core/ncurses/ncurses_6.0.bb
new file mode 100644
index 0000000000..e956e3f984
--- /dev/null
+++ b/meta/recipes-core/ncurses/ncurses_6.0.bb
@@ -0,0 +1,10 @@
+require ncurses.inc
+
+REVISION = "20150810"
+
+SRC_URI += "file://tic-hang.patch \
+            file://config.cache \
+"
+S = "${WORKDIR}/${BP}-${REVISION}"
+SRC_URI[md5sum] = "78bfcb4634a87b4cda390956586f8f1f"
+SRC_URI[sha256sum] = "85d4a615731bc71075416fc3bea15a56740bed42b3596bbb126226af4111c65c"