summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2017-10-12 10:20:19 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-10-16 22:52:43 (GMT)
commit5cb096ba2b3cdddc4d28bd59761e5503271f9240 (patch)
tree96716734046565f214e6929c27e6815da8ca53ff /meta
parent258fd9fb7263bc915c7429eef220dd8ce4af66e3 (diff)
downloadpoky-5cb096ba2b3cdddc4d28bd59761e5503271f9240.tar.gz
screen: fix configure failed while build dir contains "yes"
While the name of build dir contains "yes", the AC_EGREP_CPP test always return true. We rarely use "yes;" to name build dir, so s/yes/yes;/g could fix the issue. (From OE-Core rev: ba0bc9d2a07848706debb915883817b2ed88c218) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/screen/screen/0001-configure.ac-fix-configure-failed-while-build-dir-ha.patch108
-rw-r--r--meta/recipes-extended/screen/screen_4.6.1.bb1
2 files changed, 109 insertions, 0 deletions
diff --git a/meta/recipes-extended/screen/screen/0001-configure.ac-fix-configure-failed-while-build-dir-ha.patch b/meta/recipes-extended/screen/screen/0001-configure.ac-fix-configure-failed-while-build-dir-ha.patch
new file mode 100644
index 0000000..e8db12c
--- /dev/null
+++ b/meta/recipes-extended/screen/screen/0001-configure.ac-fix-configure-failed-while-build-dir-ha.patch
@@ -0,0 +1,108 @@
1From 4b258c5a9078f8df60684ab7536ce3a8ff207e08 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Thu, 12 Oct 2017 10:03:57 +0000
4Subject: [PATCH] configure.ac: fix configure failed while build dir contains "yes"
5
6While the name of build dir contains "yes", the AC_EGREP_CPP
7test always return true.
8
9We rarely use "yes;" to name build dir, so s/yes/yes;/g
10could fix the issue
11
12Upstream-Status: Pending
13
14Signed-off-by: Jian Kang <jian.kang@windriver.com>
15---
16 configure.ac | 20 ++++++++++----------
17 1 file changed, 10 insertions(+), 10 deletions(-)
18
19diff --git a/configure.ac b/configure.ac
20index 12996cd..4765af6 100644
21--- a/configure.ac
22+++ b/configure.ac
23@@ -128,7 +128,7 @@ fi
24
25
26 AC_CHECKING(for Ultrix)
27-AC_EGREP_CPP(yes,
28+AC_EGREP_CPP(yes;,
29 [#if defined(ultrix) || defined(__ultrix)
30 yes;
31 #endif
32@@ -145,7 +145,7 @@ dnl ghazi@caip.rutgers.edu (Kaveh R. Ghazi):
33 dnl BBN butterfly is not POSIX, but a MACH BSD system.
34 dnl Do not define POSIX and TERMIO.
35 AC_CHECKING(for butterfly)
36-AC_EGREP_CPP(yes,
37+AC_EGREP_CPP(yes;,
38 [#if defined(butterfly)
39 yes;
40 #endif
41@@ -156,7 +156,7 @@ if test -n "$ULTRIX"; then
42 test -z "$GCC" && CC="$CC -YBSD"
43 fi
44 AC_CHECKING(for POSIX.1)
45-AC_EGREP_CPP(yes,
46+AC_EGREP_CPP(yes;,
47 [#include <sys/types.h>
48 #include <unistd.h>
49 main () {
50@@ -173,14 +173,14 @@ AC_TRY_COMPILE(
51 #include <fcntl.h>], [int x = SIGCHLD | FNDELAY;], , AC_DEFINE(SYSV))
52
53 AC_CHECKING(for sequent/ptx)
54-AC_EGREP_CPP(yes,
55+AC_EGREP_CPP(yes;,
56 [#ifdef _SEQUENT_
57 yes;
58 #endif
59 ], LIBS="$LIBS -lsocket -linet";seqptx=1)
60
61 AC_CHECKING(SVR4)
62-AC_EGREP_CPP(yes,
63+AC_EGREP_CPP(yes;,
64 [main () {
65 #if defined(SVR4) || defined(__SVR4)
66 yes;
67@@ -200,9 +200,9 @@ fi
68 AC_CHECK_HEADERS([stropts.h string.h strings.h])
69
70 AC_CHECKING(for Solaris 2.x)
71-AC_EGREP_CPP(yes,
72+AC_EGREP_CPP(yes;,
73 [#if defined(SVR4) && defined(sun)
74- yes
75+ yes;
76 #endif
77 ], LIBS="$LIBS -lsocket -lnsl -lkstat")
78
79@@ -697,7 +697,7 @@ else
80 pdir='/dev'
81 fi
82 dnl SCO uses ptyp%d
83-AC_EGREP_CPP(yes,
84+AC_EGREP_CPP(yes;,
85 [#ifdef M_UNIX
86 yes;
87 #endif
88@@ -880,7 +880,7 @@ fi
89 )
90
91 if test -z "$load" ; then
92-AC_EGREP_CPP(yes,
93+AC_EGREP_CPP(yes;,
94 [#if defined(NeXT) || defined(apollo) || defined(linux)
95 yes;
96 #endif
97@@ -1112,7 +1112,7 @@ AC_CHECKING(syslog in libbsd.a)
98 AC_TRY_LINK(, [closelog();], AC_NOTE(- found.), [LIBS="$oldlibs"
99 AC_NOTE(- bad news: syslog missing.) AC_DEFINE(NOSYSLOG)])])
100
101-AC_EGREP_CPP(yes,
102+AC_EGREP_CPP(yes;,
103 [#ifdef M_UNIX
104 yes;
105 #endif
106--
1072.13.3
108
diff --git a/meta/recipes-extended/screen/screen_4.6.1.bb b/meta/recipes-extended/screen/screen_4.6.1.bb
index 84baae9..bcd83a2 100644
--- a/meta/recipes-extended/screen/screen_4.6.1.bb
+++ b/meta/recipes-extended/screen/screen_4.6.1.bb
@@ -23,6 +23,7 @@ SRC_URI = "${GNU_MIRROR}/screen/screen-${PV}.tar.gz \
23 file://Avoid-mis-identifying-systems-as-SVR4.patch \ 23 file://Avoid-mis-identifying-systems-as-SVR4.patch \
24 file://0002-comm.h-now-depends-on-term.h.patch \ 24 file://0002-comm.h-now-depends-on-term.h.patch \
25 file://0001-fix-for-multijob-build.patch \ 25 file://0001-fix-for-multijob-build.patch \
26 file://0001-configure.ac-fix-configure-failed-while-build-dir-ha.patch \
26 " 27 "
27 28
28SRC_URI[md5sum] = "132c893aabfaf2020074790215c8cacd" 29SRC_URI[md5sum] = "132c893aabfaf2020074790215c8cacd"