ncurses: fix libtool issues with libtool 2.2.4, safe for general consumption

6 files changed, 125 insertions, 54 deletions

diff --git a/packages/ncurses/ncurses-native_5.4.bb b/packages/ncurses/ncurses-native_5.4.bb
index 95ca23f717..310a4bb27c 100644
--- a/packages/ncurses/ncurses-native_5.4.bb
+++ b/packages/ncurses/ncurses-native_5.4.bb
@@ -1,14 +1,4 @@
 require ncurses_${PV}.bb
-
 inherit native
-
-DEPENDS = ""
-
 EXTRA_OEMAKE = '"BUILD_CCFLAGS=${BUILD_CCFLAGS}"'
-
-FILESPATH = "${FILE_DIRNAME}/local:${FILE_DIRNAME}/ncurses-${PV}-${PR}:${FILE_DIRNAME}/ncurses-${PV}:${FILE_DIRNAME}/ncurses:${FILE_DIRNAME}"
-
-do_install() {
-	:
-}
-
+DEPENDS = ""
diff --git a/packages/ncurses/ncurses-sdk_5.4.bb b/packages/ncurses/ncurses-sdk_5.4.bb
new file mode 100644
index 0000000000..fb69c1ec7d
--- /dev/null
+++ b/packages/ncurses/ncurses-sdk_5.4.bb
@@ -0,0 +1,3 @@
+require ncurses_${PV}.bb
+inherit sdk
+EXTRA_OEMAKE = '"BUILD_CCFLAGS=${BUILD_CCFLAGS}"'
diff --git a/packages/ncurses/ncurses.inc b/packages/ncurses/ncurses.inc
index 7b1d2cb022..fd0885356b 100644
--- a/packages/ncurses/ncurses.inc
+++ b/packages/ncurses/ncurses.inc
@@ -1,15 +1,28 @@
 DESCRIPTION = "Ncurses library"
 HOMEPAGE = "http://www.gnu.org/software/ncurses/ncurses.html"
-SECTION = "libs"
 LICENSE = "MIT"
+SECTION = "libs"
 DEPENDS = "ncurses-native"
+PACKAGES_prepend = "ncurses-tools "
+PACKAGES_append = " ncurses-terminfo"
+FILES_ncurses_append = " ${datadir}/tabset"
 RSUGGESTS_${PN} = "ncurses-terminfo"
+RPROVIDES = "libncurses5"
 
 inherit autotools
 
-PARALLEL_MAKE = ""
+# This keeps only tput/tset in ncurses
+# clear/reset are in already busybox
+FILES_ncurses-tools = "${bindir}/tic ${bindir}/toe ${bindir}/infotocap ${bindir}/captoinfo ${bindir}/infocmp ${bindir}/clear.${PN} ${bindir}/reset.${PN} ${bindir}/tack "
+FILES_ncurses-terminfo = "${datadir}/terminfo"
+FILES_${PN} = "${bindir}/tput ${bindir}/tset ${libdir}/lib*.so.* usr/share/tabset etc/terminfo"
+
+PARALLEL_MAKE=""
+
+FILESPATH = "${FILE_DIRNAME}/local:${FILE_DIRNAME}/ncurses-${PV}-${PR}:${FILE_DIRNAME}/ncurses-${PV}:${FILE_DIRNAME}/ncurses:${FILE_DIRNAME}"
 
 EXTRA_OECONF = "--with-shared \
+                --with-libtool \
 	        --without-profile \
 	        --without-debug \
 	        --disable-rpath \
@@ -20,7 +33,6 @@ EXTRA_OECONF = "--with-shared \
 	        --without-cxx-binding \
 	        --with-terminfo-dirs=${sysconfdir}/terminfo:${datadir}/terminfo \
 	        --enable-overwrite"
-
 export BUILD_CCFLAGS = "-I${S}/ncurses -I${S}/include ${BUILD_CFLAGS}"
 export BUILD_LDFLAGS = ""
 export EXTRA_OEMAKE = '"BUILD_LDFLAGS=" "BUILD_CCFLAGS=${BUILD_CCFLAGS}"'
@@ -64,48 +76,24 @@ do_install() {
 		ln -sf xterm-color ${D}${sysconfdir}/terminfo/x/xterm
 	fi
 
-	mv ${D}${bindir}/clear ${D}${bindir}/clear.${PN}
-	mv ${D}${bindir}/reset ${D}${bindir}/reset.${PN}
+	if [ "${PN}" = "ncurses" ]; then
+		mv ${D}${bindir}/clear ${D}${bindir}/clear.${PN}
+		mv ${D}${bindir}/reset ${D}${bindir}/reset.${PN}
+	fi
 }
 		
 		
 pkg_postinst_ncurses-tools () {
-	update-alternatives --install ${bindir}/clear clear clear.${PN} 100
-	update-alternatives --install ${bindir}/reset reset reset.${PN} 100
+	if [ "${PN}" = "ncurses" ]; then
+		update-alternatives --install ${bindir}/clear clear clear.${PN} 100
+		update-alternatives --install ${bindir}/reset reset reset.${PN} 100
+	fi
 }
 				
 			
 pkg_prerm_ncurses-tools () {
-	update-alternatives --remove clear clear.${PN}
-	update-alternatives --remove reset reset.${PN}
+	if [ "${PN}" = "ncurses" ]; then
+		update-alternatives --remove clear clear.${PN}
+		update-alternatives --remove reset reset.${PN}
+	fi
 }
-
-
-PACKAGES =+ "${PN}-ncurses ${PN}-panel ${PN}-menu ${PN}-form ${PN}-terminfo ${PN}-tools"
-FILES_${PN}-ncurses = "${libdir}/libncurses.so.*"
-# You can'r really run any ncurses app without terminfo files, which is why the packaging was that way before mickeyl broke it. 
-# This RRECOMMENDS should pull in terminfo to fix that 
-RRECOMMENDS_${PN}-ncurses = "${PN}-terminfo"
-FILES_${PN}-panel = "${libdir}/libpanel.so.*"
-FILES_${PN}-menu = "${libdir}/libmenu.so.*"
-FILES_${PN}-form = "${libdir}/libform.so.*"
-FILES_${PN}-terminfo = "\
-  ${libdir}/terminfo \
-  ${datadir}/terminfo \
-"
-FILES_${PN}-tools = "\
-  ${bindir}/tic \
-  ${bindir}/tack \
-  ${bindir}/toe \
-  ${bindir}/infotocap \
-  ${bindir}/captoinfo \
-  ${bindir}/infocmp \
-  ${bindir}/clear.${PN} \
-  ${bindir}/reset.${PN} \
-"
-FILES_${PN} = "\
-  ${bindir}/tput \
-  ${bindir}/tset \
-  ${datadir}/tabset \
-  ${sysconfdir}/terminfo \
-"
diff --git a/packages/ncurses/ncurses/makefile_tweak.patch b/packages/ncurses/ncurses/makefile_tweak.patch
new file mode 100644
index 0000000000..480855bcc6
--- /dev/null
+++ b/packages/ncurses/ncurses/makefile_tweak.patch
@@ -0,0 +1,89 @@
+Libtool 2.2.2 needs to be able to use top_builddir. Automake usually exports 
+this but ncurses doesn't use automake.
+
+RP 14/4/08
+
+Index: ncurses-5.4/ncurses/Makefile.in
+===================================================================
+--- ncurses-5.4.orig/ncurses/Makefile.in	2008-04-14 12:22:34.000000000 +0100
++++ ncurses-5.4/ncurses/Makefile.in	2008-04-14 12:22:53.000000000 +0100
+@@ -57,6 +57,7 @@
+ MODEL		= @DFT_LWR_MODEL@
+ DESTDIR		= @DESTDIR@
+ top_srcdir	= @top_srcdir@
++top_builddir	= @top_srcdir@
+ srcdir		= @srcdir@
+ prefix		= @prefix@
+ exec_prefix	= @exec_prefix@
+Index: ncurses-5.4/form/Makefile.in
+===================================================================
+--- ncurses-5.4.orig/form/Makefile.in	2008-04-14 12:30:35.000000000 +0100
++++ ncurses-5.4/form/Makefile.in	2008-04-14 12:30:59.000000000 +0100
+@@ -51,6 +51,7 @@
+ MODEL		= @DFT_LWR_MODEL@
+ DESTDIR		= @DESTDIR@
+ srcdir		= @srcdir@
++top_builddir	= @top_srcdir@
+ prefix		= @prefix@
+ exec_prefix	= @exec_prefix@
+ bindir		= @bindir@
+Index: ncurses-5.4/menu/Makefile.in
+===================================================================
+--- ncurses-5.4.orig/menu/Makefile.in	2008-04-14 12:29:00.000000000 +0100
++++ ncurses-5.4/menu/Makefile.in	2008-04-14 12:29:13.000000000 +0100
+@@ -51,6 +51,7 @@
+ MODEL		= @DFT_LWR_MODEL@
+ DESTDIR		= @DESTDIR@
+ srcdir		= @srcdir@
++top_builddir	= @top_srcdir@
+ prefix		= @prefix@
+ exec_prefix	= @exec_prefix@
+ bindir		= @bindir@
+Index: ncurses-5.4/panel/Makefile.in
+===================================================================
+--- ncurses-5.4.orig/panel/Makefile.in	2008-04-14 12:27:40.000000000 +0100
++++ ncurses-5.4/panel/Makefile.in	2008-04-14 12:27:59.000000000 +0100
+@@ -51,6 +51,7 @@
+ MODEL		= @DFT_LWR_MODEL@
+ DESTDIR		= @DESTDIR@
+ srcdir		= @srcdir@
++top_builddir	= @top_srcdir@
+ prefix		= @prefix@
+ exec_prefix	= @exec_prefix@
+ bindir		= @bindir@
+Index: ncurses-5.4/progs/Makefile.in
+===================================================================
+--- ncurses-5.4.orig/progs/Makefile.in	2008-04-14 12:24:37.000000000 +0100
++++ ncurses-5.4/progs/Makefile.in	2008-04-14 12:25:06.000000000 +0100
+@@ -54,6 +54,7 @@
+ MODEL		= ../@DFT_OBJ_SUBDIR@
+ DESTDIR		= @DESTDIR@
+ srcdir		= @srcdir@
++top_builddir	= @top_srcdir@
+ prefix		= @prefix@
+ exec_prefix	= @exec_prefix@
+ bindir		= @bindir@
+Index: ncurses-5.4/tack/Makefile.in
+===================================================================
+--- ncurses-5.4.orig/tack/Makefile.in	2008-04-14 12:26:05.000000000 +0100
++++ ncurses-5.4/tack/Makefile.in	2008-04-14 12:26:26.000000000 +0100
+@@ -22,6 +22,7 @@
+ MODEL		= ../@DFT_OBJ_SUBDIR@
+ DESTDIR		= @DESTDIR@
+ srcdir		= @srcdir@
++top_builddir    = @top_srcdir@
+ prefix		= @prefix@
+ exec_prefix	= @exec_prefix@
+ bindir		= @bindir@
+Index: ncurses-5.4/test/Makefile.in
+===================================================================
+--- ncurses-5.4.orig/test/Makefile.in	2008-04-14 12:32:37.000000000 +0100
++++ ncurses-5.4/test/Makefile.in	2008-04-14 12:32:56.000000000 +0100
+@@ -43,6 +43,7 @@
+ 
+ MODEL		= ../@DFT_OBJ_SUBDIR@
+ srcdir		= @srcdir@
++top_builddir	= @top_srcdir@
+ prefix		= @prefix@
+ exec_prefix	= @exec_prefix@
+ libdir		= @libdir@
diff --git a/packages/ncurses/ncurses/visibility.patch b/packages/ncurses/ncurses/visibility.patch
index 66366ce3ea..29cac5f1b8 100644
--- a/packages/ncurses/ncurses/visibility.patch
+++ b/packages/ncurses/ncurses/visibility.patch
@@ -2187,14 +2187,14 @@
 +	CPPFLAGS="-I\$(srcdir)/../include $CPPFLAGS"
 +fi
 +if test "$GCC" != yes; then
-+	CPPFLAGS="$CPPFLAGS"
++	CPPFLAGS="$CPPFLAGS -I\$(includedir)"
 +elif test "$includedir" != "/usr/include"; then
 +	if test "$includedir" = '${prefix}/include' ; then
 +		if test $prefix != /usr ; then
-+			CPPFLAGS="$CPPFLAGS"
++			CPPFLAGS="$CPPFLAGS -I\$(includedir)"
 +		fi
 +	else
-+		CPPFLAGS="$CPPFLAGS"
++		CPPFLAGS="$CPPFLAGS -I\$(includedir)"
 +	fi
 +fi
 +AC_SUBST(CPPFLAGS)
diff --git a/packages/ncurses/ncurses_5.4.bb b/packages/ncurses/ncurses_5.4.bb
index d73164d3c0..2cd0cf0de0 100644
--- a/packages/ncurses/ncurses_5.4.bb
+++ b/packages/ncurses/ncurses_5.4.bb
@@ -1,6 +1,7 @@
-PR = "r14"
+PR = "r15"
 
 SRC_URI = "${GNU_MIRROR}/ncurses/ncurses-${PV}.tar.gz \
+           file://makefile_tweak.patch;patch=1 \
            file://visibility.patch;patch=1"
 S = "${WORKDIR}/ncurses-${PV}"