summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteffen Sledz <sledz@dresearch-fe.de>2013-11-28 15:09:31 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-12-12 23:10:56 +0000
commit2b38832f976cbd169d5ac6e2a5fd3ab38d614fc7 (patch)
tree99fab98794539eeceae87129fc98edc6d3d245b6
parent6b124ff57eda9af541e61f5e0e8a895de1e58e3a (diff)
downloadpoky-2b38832f976cbd169d5ac6e2a5fd3ab38d614fc7.tar.gz
gdb-7.6.1: fix cygwin check in configure script
This is a fix which avoids false positives if the search pattern "lose" is found in path descriptions in comments generated by the preprocessor we hit in our development environment. [gdb Bug #16152] -- https://sourceware.org/bugzilla/show_bug.cgi?id=16152 Upstream-Status: Accepted (From OE-Core rev: 62849843a4a83b10316bc6cb1e4b3f0622391dea) Signed-off-by: Steffen Sledz <sledz@dresearch-fe.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/gdb/gdb-7.6.1.inc2
-rw-r--r--meta/recipes-devtools/gdb/gdb/gdb-fix-cygwin-check-in-configure-script.patch38
2 files changed, 40 insertions, 0 deletions
diff --git a/meta/recipes-devtools/gdb/gdb-7.6.1.inc b/meta/recipes-devtools/gdb/gdb-7.6.1.inc
index d1270f97a4..e5777329ab 100644
--- a/meta/recipes-devtools/gdb/gdb-7.6.1.inc
+++ b/meta/recipes-devtools/gdb/gdb-7.6.1.inc
@@ -4,6 +4,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
4 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \ 4 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \
5 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674" 5 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674"
6 6
7SRC_URI += " file://gdb-fix-cygwin-check-in-configure-script.patch "
8
7S = "${WORKDIR}/${BPN}-${PV}" 9S = "${WORKDIR}/${BPN}-${PV}"
8 10
9SRC_URI[md5sum] = "d42841167fd061d90fddf9a7212a1f9f" 11SRC_URI[md5sum] = "d42841167fd061d90fddf9a7212a1f9f"
diff --git a/meta/recipes-devtools/gdb/gdb/gdb-fix-cygwin-check-in-configure-script.patch b/meta/recipes-devtools/gdb/gdb/gdb-fix-cygwin-check-in-configure-script.patch
new file mode 100644
index 0000000000..4e4647b0d9
--- /dev/null
+++ b/meta/recipes-devtools/gdb/gdb/gdb-fix-cygwin-check-in-configure-script.patch
@@ -0,0 +1,38 @@
1Avoid false positives if the search pattern "lose" is found in path
2descriptions in comments generated by the preprocessor.
3
4See <https://sourceware.org/bugzilla/show_bug.cgi?id=16152>.
5---
6 gdb/configure | 2 +-
7 gdb/configure.ac | 2 +-
8 3 files changed, 7 insertions(+), 2 deletions(-)
9
10diff --git a/gdb/configure b/gdb/configure
11index 5514b2f..b38e183 100755
12--- a/gdb/configure
13+++ b/gdb/configure
14@@ -12446,7 +12446,7 @@ lose
15 #endif
16 _ACEOF
17 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
18- $EGREP "lose" >/dev/null 2>&1; then :
19+ $EGREP "^lose$" >/dev/null 2>&1; then :
20 gdb_cv_os_cygwin=yes
21 else
22 gdb_cv_os_cygwin=no
23diff --git a/gdb/configure.ac b/gdb/configure.ac
24index 9b73887..2947293 100644
25--- a/gdb/configure.ac
26+++ b/gdb/configure.ac
27@@ -1877,7 +1877,7 @@ AC_SUBST(WERROR_CFLAGS)
28
29 # In the Cygwin environment, we need some additional flags.
30 AC_CACHE_CHECK([for cygwin], gdb_cv_os_cygwin,
31-[AC_EGREP_CPP(lose, [
32+[AC_EGREP_CPP(^lose$, [
33 #if defined (__CYGWIN__) || defined (__CYGWIN32__)
34 lose
35 #endif],[gdb_cv_os_cygwin=yes],[gdb_cv_os_cygwin=no])])
36--
371.8.4
38