mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-07-17 04:37:19 +00:00
Code Issues Projects Releases Wiki Activity

dialog: upgrade to 1.2-20150225

Browse Source 
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>
This commit is contained in:
Roy Li
2015-05-06 10:23:52 +08:00
committed by Martin Jansa
parent 738bc2733b
commit 11617df76a
4 changed files with 13 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-extended/dialog/dialog-static_1.1-20120706.bb
-6
View File
@@ -1,6 +0,0 @@
require dialog.inc
LDFLAGS += "-static"
SRC_URI[md5sum] = "2e538305977178eb085a9859511c299d"
SRC_URI[sha256sum] = "305aa1000680aa87bb2148a725f9107ef4cd29dcd6185b44d079cb87cf0ce2f5"
meta-oe/recipes-extended/dialog/dialog_1.1-20120706.bb
-4
View File
@@ -1,4 +0,0 @@
require dialog.inc
SRC_URI[md5sum] = "2e538305977178eb085a9859511c299d"
SRC_URI[sha256sum] = "305aa1000680aa87bb2148a725f9107ef4cd29dcd6185b44d079cb87cf0ce2f5"
meta-oe/recipes-extended/dialog/dialog.inc → meta-oe/recipes-extended/dialog/dialog_1.2-20150225.bb
+3
View File
@@ -8,6 +8,9 @@ DEPENDS = "ncurses"
LICENSE = "LGPL-2.1" LICENSE = "LGPL-2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343"
SRC_URI[md5sum] = "38ef59a7daa5459119cb06777c735e4b"
SRC_URI[sha256sum] = "6844b13a7a1fea568a8d5bb3004e1af90888cd4a5e8c2ded2c38f34fcc7397ff"
SRC_URI = "ftp://invisible-island.net/dialog/dialog-${PV}.tgz \ SRC_URI = "ftp://invisible-island.net/dialog/dialog-${PV}.tgz \
file://use-pkg-config-for-ncurses-detection.patch \ file://use-pkg-config-for-ncurses-detection.patch \
" "
meta-oe/recipes-extended/dialog/files/use-pkg-config-for-ncurses-detection.patch
+10 -18
View File
@@ -8,33 +8,25 @@ file, and autoconf can not work, make a workaround in configure file.
Signed-off-by: Roy Li <rongqing.li@windriver.com> Signed-off-by: Roy Li <rongqing.li@windriver.com>
--- ---
configure | 6 +++--- configure | 5 ++---
1 file changed, 3 insertions(+), 3 deletions(-) 1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/configure b/configure diff --git a/configure b/configure
index 24e28c1..c78735d 100755 index 8afe3d7..a54bcc1 100755
--- a/configure --- a/configure
+++ b/configure +++ b/configure
@@ -9976,8 +9976,8 @@ fi @@ -11567,9 +11567,8 @@ fi
if test "$NCURSES_CONFIG" != none ; then if test "$NCURSES_CONFIG" != none ; then
-CPPFLAGS="$CPPFLAGS `$NCURSES_CONFIG --cflags`" -CPPFLAGS="$CPPFLAGS `$NCURSES_CONFIG --cflags`"
-LIBS="`$NCURSES_CONFIG --libs` $LIBS" -
-cf_add_libs="`$NCURSES_CONFIG --libs`"
+CPPFLAGS="$CPPFLAGS `pkg-config --short-errors --print-errors --cflags "ncurses" 2>/dev/null`" +CPPFLAGS="$CPPFLAGS `pkg-config --short-errors --print-errors --cflags "ncurses" 2>/dev/null`"
+LIBS="`pkg-config --short-errors --print-errors --libs "ncurses" 2>/dev/null` $LIBS" +cf_add_libs="`pkg-config --short-errors --print-errors --libs "ncurses" 2>/dev/null` $LIBS"
# Filter out duplicates - this happens with badly-designed ".pc" files...
# even with config script, some packages use no-override for curses.h for cf_add_1lib in $LIBS
do
@@ -10096,7 +10096,7 @@ cat >>confdefs.h <<EOF
#define $cf_nculib_ROOT 1
EOF
-cf_cv_ncurses_version=`$NCURSES_CONFIG --version`
+cf_cv_ncurses_version=`pkg-config --short-errors --print-errors --modversion "ncurses"`
else
-- --
1.7.10.4 1.7.10.4