summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-04-14 22:15:16 +0000
committerRichard Purdie <richard@openedhand.com>2008-04-14 22:15:16 +0000
commit50f74c5b385f9968be1c0dc70eea03ef29061d5b (patch)
tree85cfccb3c7c14fb9ffb313fa6c06e39c9e4c702a
parentfd84c3e3a39c0f7f3e7faa34725e049371f8ab01 (diff)
downloadpoky-50f74c5b385f9968be1c0dc70eea03ef29061d5b.tar.gz
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
Diffstat
-rw-r--r--meta/packages/ncurses/ncurses.inc1
-rw-r--r--meta/packages/ncurses/ncurses/makefile_tweak.patch89
-rw-r--r--meta/packages/ncurses/ncurses_5.4.bb5
3 files changed, 93 insertions, 2 deletions
diff --git a/meta/packages/ncurses/ncurses.inc b/meta/packages/ncurses/ncurses.inc
index 027f037ee5..60cc9db66b 100644
--- 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
20PARALLEL_MAKE="" 20PARALLEL_MAKE=""
21 21
22EXTRA_OECONF = "--with-shared \ 22EXTRA_OECONF = "--with-shared \
23 --with-libtool \
23 --without-profile \ 24 --without-profile \
24 --without-debug \ 25 --without-debug \
25 --disable-rpath \ 26 --disable-rpath \
diff --git a/meta/packages/ncurses/ncurses/makefile_tweak.patch b/meta/packages/ncurses/ncurses/makefile_tweak.patch
new file mode 100644
index 0000000000..480855bcc6
--- /dev/null
+++ b/meta/packages/ncurses/ncurses/makefile_tweak.patch
@@ -0,0 +1,89 @@
1Libtool 2.2.2 needs to be able to use top_builddir. Automake usually exports
2this but ncurses doesn't use automake.
3
4RP 14/4/08
5
6Index: ncurses-5.4/ncurses/Makefile.in
7===================================================================
8--- ncurses-5.4.orig/ncurses/Makefile.in 2008-04-14 12:22:34.000000000 +0100
9+++ ncurses-5.4/ncurses/Makefile.in 2008-04-14 12:22:53.000000000 +0100
10@@ -57,6 +57,7 @@
11 MODEL = @DFT_LWR_MODEL@
12 DESTDIR = @DESTDIR@
13 top_srcdir = @top_srcdir@
14+top_builddir = @top_srcdir@
15 srcdir = @srcdir@
16 prefix = @prefix@
17 exec_prefix = @exec_prefix@
18Index: ncurses-5.4/form/Makefile.in
19===================================================================
20--- ncurses-5.4.orig/form/Makefile.in 2008-04-14 12:30:35.000000000 +0100
21+++ ncurses-5.4/form/Makefile.in 2008-04-14 12:30:59.000000000 +0100
22@@ -51,6 +51,7 @@
23 MODEL = @DFT_LWR_MODEL@
24 DESTDIR = @DESTDIR@
25 srcdir = @srcdir@
26+top_builddir = @top_srcdir@
27 prefix = @prefix@
28 exec_prefix = @exec_prefix@
29 bindir = @bindir@
30Index: ncurses-5.4/menu/Makefile.in
31===================================================================
32--- ncurses-5.4.orig/menu/Makefile.in 2008-04-14 12:29:00.000000000 +0100
33+++ ncurses-5.4/menu/Makefile.in 2008-04-14 12:29:13.000000000 +0100
34@@ -51,6 +51,7 @@
35 MODEL = @DFT_LWR_MODEL@
36 DESTDIR = @DESTDIR@
37 srcdir = @srcdir@
38+top_builddir = @top_srcdir@
39 prefix = @prefix@
40 exec_prefix = @exec_prefix@
41 bindir = @bindir@
42Index: ncurses-5.4/panel/Makefile.in
43===================================================================
44--- ncurses-5.4.orig/panel/Makefile.in 2008-04-14 12:27:40.000000000 +0100
45+++ ncurses-5.4/panel/Makefile.in 2008-04-14 12:27:59.000000000 +0100
46@@ -51,6 +51,7 @@
47 MODEL = @DFT_LWR_MODEL@
48 DESTDIR = @DESTDIR@
49 srcdir = @srcdir@
50+top_builddir = @top_srcdir@
51 prefix = @prefix@
52 exec_prefix = @exec_prefix@
53 bindir = @bindir@
54Index: ncurses-5.4/progs/Makefile.in
55===================================================================
56--- ncurses-5.4.orig/progs/Makefile.in 2008-04-14 12:24:37.000000000 +0100
57+++ ncurses-5.4/progs/Makefile.in 2008-04-14 12:25:06.000000000 +0100
58@@ -54,6 +54,7 @@
59 MODEL = ../@DFT_OBJ_SUBDIR@
60 DESTDIR = @DESTDIR@
61 srcdir = @srcdir@
62+top_builddir = @top_srcdir@
63 prefix = @prefix@
64 exec_prefix = @exec_prefix@
65 bindir = @bindir@
66Index: ncurses-5.4/tack/Makefile.in
67===================================================================
68--- ncurses-5.4.orig/tack/Makefile.in 2008-04-14 12:26:05.000000000 +0100
69+++ ncurses-5.4/tack/Makefile.in 2008-04-14 12:26:26.000000000 +0100
70@@ -22,6 +22,7 @@
71 MODEL = ../@DFT_OBJ_SUBDIR@
72 DESTDIR = @DESTDIR@
73 srcdir = @srcdir@
74+top_builddir = @top_srcdir@
75 prefix = @prefix@
76 exec_prefix = @exec_prefix@
77 bindir = @bindir@
78Index: ncurses-5.4/test/Makefile.in
79===================================================================
80--- ncurses-5.4.orig/test/Makefile.in 2008-04-14 12:32:37.000000000 +0100
81+++ ncurses-5.4/test/Makefile.in 2008-04-14 12:32:56.000000000 +0100
82@@ -43,6 +43,7 @@
83
84 MODEL = ../@DFT_OBJ_SUBDIR@
85 srcdir = @srcdir@
86+top_builddir = @top_srcdir@
87 prefix = @prefix@
88 exec_prefix = @exec_prefix@
89 libdir = @libdir@
diff --git a/meta/packages/ncurses/ncurses_5.4.bb b/meta/packages/ncurses/ncurses_5.4.bb
index 6da32232af..d10bd58f21 100644
--- a/meta/packages/ncurses/ncurses_5.4.bb
+++ b/meta/packages/ncurses/ncurses_5.4.bb
@@ -1,7 +1,8 @@
1PR = "r9" 1PR = "r10"
2 2
3SRC_URI = "${GNU_MIRROR}/ncurses/ncurses-${PV}.tar.gz \ 3SRC_URI = "${GNU_MIRROR}/ncurses/ncurses-${PV}.tar.gz \
4 file://visibility.patch;patch=1" 4 file://makefile_tweak.patch;patch=1 \
5 file://visibility.patch;patch=1"
5S = "${WORKDIR}/ncurses-${PV}" 6S = "${WORKDIR}/ncurses-${PV}"
6 7
7require ncurses.inc 8require ncurses.inc
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-10 16:44:48 +0000