ncurses: Enable using libtool, fix makefiles so libtool works

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4255 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/packages/ncurses/ncurses.inc b/meta/packages/ncurses/ncurses.inc
index 027f037ee5ec6e47302b1a44f3f21b2bfd2e8d07..60cc9db66bffac9481a1fda095a59b7b31e590df 100644 (file)
--- a/meta/packages/ncurses/ncurses.inc
+++ b/meta/packages/ncurses/ncurses.inc
@@ -20,6 +20,7 @@ FILES_${PN} = "${bindir}/tput ${bindir}/tset ${libdir}/lib*.so.* usr/share/tabse
 PARALLEL_MAKE=""
 
 EXTRA_OECONF = "--with-shared \
+                --with-libtool \
                --without-profile \
                --without-debug \
                --disable-rpath \

diff --git a/meta/packages/ncurses/ncurses/makefile_tweak.patch b/meta/packages/ncurses/ncurses/makefile_tweak.patch
new file mode 100644 (file)
index 0000000..480855b
--- /dev/null
+++ b/meta/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/meta/packages/ncurses/ncurses_5.4.bb b/meta/packages/ncurses/ncurses_5.4.bb
index 6da32232af9f8dfdbd6c30718948969581507875..d10bd58f21617cdb3618feed13f66513bf08cd67 100644 (file)
--- a/meta/packages/ncurses/ncurses_5.4.bb
+++ b/meta/packages/ncurses/ncurses_5.4.bb
@@ -1,7 +1,8 @@
-PR = "r9"
+PR = "r10"
 
 SRC_URI = "${GNU_MIRROR}/ncurses/ncurses-${PV}.tar.gz \
-          file://visibility.patch;patch=1"
+           file://makefile_tweak.patch;patch=1 \
+           file://visibility.patch;patch=1"
 S = "${WORKDIR}/ncurses-${PV}"
 
 require ncurses.inc