diff options
author | Roy Li <rongqing.li@windriver.com> | 2015-05-06 10:23:52 +0800 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-05-13 14:34:18 +0200 |
commit | 11617df76a1c1e320600c0e10fadd627dfe5718b (patch) | |
tree | efe6f3a72f2bb53dfb811953c11d89d8c9b4c081 /meta-oe/recipes-extended/dialog | |
parent | 738bc2733b8bfa74c6b331de9676fc9aa1313b81 (diff) | |
download | meta-openembedded-11617df76a1c1e320600c0e10fadd627dfe5718b.tar.gz |
dialog: upgrade to 1.2-20150225
1. upgrade it to 1.2-20150225
2. update the use-pkg-config-for-ncurses-detection.patch
3. remove dialog-static recipe file, since dialog will generate the static
library.
Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-extended/dialog')
-rw-r--r-- | meta-oe/recipes-extended/dialog/dialog-static_1.1-20120706.bb | 6 | ||||
-rw-r--r-- | meta-oe/recipes-extended/dialog/dialog_1.1-20120706.bb | 4 | ||||
-rw-r--r-- | meta-oe/recipes-extended/dialog/dialog_1.2-20150225.bb (renamed from meta-oe/recipes-extended/dialog/dialog.inc) | 3 | ||||
-rw-r--r-- | meta-oe/recipes-extended/dialog/files/use-pkg-config-for-ncurses-detection.patch | 28 |
4 files changed, 13 insertions, 28 deletions
diff --git a/meta-oe/recipes-extended/dialog/dialog-static_1.1-20120706.bb b/meta-oe/recipes-extended/dialog/dialog-static_1.1-20120706.bb deleted file mode 100644 index 595f32360..000000000 --- a/meta-oe/recipes-extended/dialog/dialog-static_1.1-20120706.bb +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | require dialog.inc | ||
2 | |||
3 | LDFLAGS += "-static" | ||
4 | |||
5 | SRC_URI[md5sum] = "2e538305977178eb085a9859511c299d" | ||
6 | SRC_URI[sha256sum] = "305aa1000680aa87bb2148a725f9107ef4cd29dcd6185b44d079cb87cf0ce2f5" | ||
diff --git a/meta-oe/recipes-extended/dialog/dialog_1.1-20120706.bb b/meta-oe/recipes-extended/dialog/dialog_1.1-20120706.bb deleted file mode 100644 index c87fb6160..000000000 --- a/meta-oe/recipes-extended/dialog/dialog_1.1-20120706.bb +++ /dev/null | |||
@@ -1,4 +0,0 @@ | |||
1 | require dialog.inc | ||
2 | |||
3 | SRC_URI[md5sum] = "2e538305977178eb085a9859511c299d" | ||
4 | SRC_URI[sha256sum] = "305aa1000680aa87bb2148a725f9107ef4cd29dcd6185b44d079cb87cf0ce2f5" | ||
diff --git a/meta-oe/recipes-extended/dialog/dialog.inc b/meta-oe/recipes-extended/dialog/dialog_1.2-20150225.bb index 995d6c07c..88af59f11 100644 --- a/meta-oe/recipes-extended/dialog/dialog.inc +++ b/meta-oe/recipes-extended/dialog/dialog_1.2-20150225.bb | |||
@@ -8,6 +8,9 @@ DEPENDS = "ncurses" | |||
8 | LICENSE = "LGPL-2.1" | 8 | LICENSE = "LGPL-2.1" |
9 | LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" | 9 | LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" |
10 | 10 | ||
11 | SRC_URI[md5sum] = "38ef59a7daa5459119cb06777c735e4b" | ||
12 | SRC_URI[sha256sum] = "6844b13a7a1fea568a8d5bb3004e1af90888cd4a5e8c2ded2c38f34fcc7397ff" | ||
13 | |||
11 | SRC_URI = "ftp://invisible-island.net/dialog/dialog-${PV}.tgz \ | 14 | SRC_URI = "ftp://invisible-island.net/dialog/dialog-${PV}.tgz \ |
12 | file://use-pkg-config-for-ncurses-detection.patch \ | 15 | file://use-pkg-config-for-ncurses-detection.patch \ |
13 | " | 16 | " |
diff --git a/meta-oe/recipes-extended/dialog/files/use-pkg-config-for-ncurses-detection.patch b/meta-oe/recipes-extended/dialog/files/use-pkg-config-for-ncurses-detection.patch index a2354ade0..0a25a7fcc 100644 --- a/meta-oe/recipes-extended/dialog/files/use-pkg-config-for-ncurses-detection.patch +++ b/meta-oe/recipes-extended/dialog/files/use-pkg-config-for-ncurses-detection.patch | |||
@@ -8,33 +8,25 @@ file, and autoconf can not work, make a workaround in configure file. | |||
8 | 8 | ||
9 | Signed-off-by: Roy Li <rongqing.li@windriver.com> | 9 | Signed-off-by: Roy Li <rongqing.li@windriver.com> |
10 | --- | 10 | --- |
11 | configure | 6 +++--- | 11 | configure | 5 ++--- |
12 | 1 file changed, 3 insertions(+), 3 deletions(-) | 12 | 1 file changed, 2 insertions(+), 3 deletions(-) |
13 | 13 | ||
14 | diff --git a/configure b/configure | 14 | diff --git a/configure b/configure |
15 | index 24e28c1..c78735d 100755 | 15 | index 8afe3d7..a54bcc1 100755 |
16 | --- a/configure | 16 | --- a/configure |
17 | +++ b/configure | 17 | +++ b/configure |
18 | @@ -9976,8 +9976,8 @@ fi | 18 | @@ -11567,9 +11567,8 @@ fi |
19 | 19 | ||
20 | if test "$NCURSES_CONFIG" != none ; then | 20 | if test "$NCURSES_CONFIG" != none ; then |
21 | 21 | ||
22 | -CPPFLAGS="$CPPFLAGS `$NCURSES_CONFIG --cflags`" | 22 | -CPPFLAGS="$CPPFLAGS `$NCURSES_CONFIG --cflags`" |
23 | -LIBS="`$NCURSES_CONFIG --libs` $LIBS" | 23 | - |
24 | -cf_add_libs="`$NCURSES_CONFIG --libs`" | ||
24 | +CPPFLAGS="$CPPFLAGS `pkg-config --short-errors --print-errors --cflags "ncurses" 2>/dev/null`" | 25 | +CPPFLAGS="$CPPFLAGS `pkg-config --short-errors --print-errors --cflags "ncurses" 2>/dev/null`" |
25 | +LIBS="`pkg-config --short-errors --print-errors --libs "ncurses" 2>/dev/null` $LIBS" | 26 | +cf_add_libs="`pkg-config --short-errors --print-errors --libs "ncurses" 2>/dev/null` $LIBS" |
26 | 27 | # Filter out duplicates - this happens with badly-designed ".pc" files... | |
27 | # even with config script, some packages use no-override for curses.h | 28 | for cf_add_1lib in $LIBS |
28 | 29 | do | |
29 | @@ -10096,7 +10096,7 @@ cat >>confdefs.h <<EOF | ||
30 | #define $cf_nculib_ROOT 1 | ||
31 | EOF | ||
32 | |||
33 | -cf_cv_ncurses_version=`$NCURSES_CONFIG --version` | ||
34 | +cf_cv_ncurses_version=`pkg-config --short-errors --print-errors --modversion "ncurses"` | ||
35 | |||
36 | else | ||
37 | |||
38 | -- | 30 | -- |
39 | 1.7.10.4 | 31 | 1.7.10.4 |
40 | 32 | ||