diff options
author | Roy Li <rongqing.li@windriver.com> | 2014-06-19 17:20:23 +0800 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-06-21 12:20:20 +0200 |
commit | 52b21a1951fc21ae1ae85440fcf6da04ad3258ea (patch) | |
tree | 637845cbffc9342f2eddc87ad027bb5351a31aee /meta-oe/recipes-extended/dialog/files/use-pkg-config-for-ncurses-detection.patch | |
parent | cc15a4fd24e461f622f5d3aa47da1792390468d2 (diff) | |
download | meta-openembedded-52b21a1951fc21ae1ae85440fcf6da04ad3258ea.tar.gz |
dialog: inherit brokensep and use pkg-config to detect ncurses
1. inherit autotools-brokensep, or else configuration will fail since B!=S
2. use pkg-config to detect ncurses, since ncurses-config no longer works
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/files/use-pkg-config-for-ncurses-detection.patch')
-rw-r--r-- | meta-oe/recipes-extended/dialog/files/use-pkg-config-for-ncurses-detection.patch | 40 |
1 files changed, 40 insertions, 0 deletions
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 new file mode 100644 index 0000000000..b5b4b3c3cf --- /dev/null +++ b/meta-oe/recipes-extended/dialog/files/use-pkg-config-for-ncurses-detection.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | Subject: [PATCH] use pkg-config for ncurses detection. | ||
2 | |||
3 | Upstream-Status: Inappropriate [configuration] | ||
4 | |||
5 | This is a workaround to make dialog be able to build after ncurses-config | ||
6 | does not work, since the configure file is called directly in dialog bb | ||
7 | file, and autoconf can not work, make a workaround in configure file. | ||
8 | |||
9 | Signed-off-by: Roy Li <rongqing.li@windriver.com> | ||
10 | --- | ||
11 | configure | 6 +++--- | ||
12 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
13 | |||
14 | diff --git a/configure b/configure | ||
15 | index 24e28c1..c78735d 100755 | ||
16 | --- a/configure | ||
17 | +++ b/configure | ||
18 | @@ -9976,8 +9976,8 @@ fi | ||
19 | |||
20 | if test "$NCURSES_CONFIG" != none ; then | ||
21 | |||
22 | -CPPFLAGS="$CPPFLAGS `$NCURSES_CONFIG --cflags`" | ||
23 | -LIBS="`$NCURSES_CONFIG --libs` $LIBS" | ||
24 | +CPPFLAGS="$CPPFLAGS `pkg-config --short-errors --print-errors --cflags "ncurses" 2>&1`" | ||
25 | +LIBS="`pkg-config --short-errors --print-errors --libs "ncurses" 2>&1` $LIBS" | ||
26 | |||
27 | # even with config script, some packages use no-override for curses.h | ||
28 | |||
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 | -- | ||
39 | 1.7.10.4 | ||
40 | |||