Patchwork [for-dora] gdb-7.6: fix cygwin check in configure script

login
register
mail settings
Submitter Steffen Sledz
Date Nov. 28, 2013, 2:09 p.m.
Message ID <1385647771-24485-1-git-send-email-sledz@dresearch-fe.de>
Download mbox | patch
Permalink /patch/62535/
State New
Headers show

Comments

Steffen Sledz - Nov. 28, 2013, 2:09 p.m.
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
Signed-off-by: Steffen Sledz <sledz@dresearch-fe.de>
---
 meta/recipes-devtools/gdb/gdb-7.6.inc              |  2 ++
 .../gdb-fix-cygwin-check-in-configure-script.patch | 38 ++++++++++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 meta/recipes-devtools/gdb/gdb/gdb-fix-cygwin-check-in-configure-script.patch
Steffen Sledz - Dec. 9, 2013, 2:47 p.m.
On 28.11.2013 15:09, Steffen Sledz wrote:
> 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
> Signed-off-by: Steffen Sledz <sledz@dresearch-fe.de>
> ---
>  meta/recipes-devtools/gdb/gdb-7.6.inc              |  2 ++
>  .../gdb-fix-cygwin-check-in-configure-script.patch | 38 ++++++++++++++++++++++
>  2 files changed, 40 insertions(+)
>  create mode 100644 meta/recipes-devtools/gdb/gdb/gdb-fix-cygwin-check-in-configure-script.patch
> 
> diff --git a/meta/recipes-devtools/gdb/gdb-7.6.inc b/meta/recipes-devtools/gdb/gdb-7.6.inc
> index 00cb6ee..9be94b8 100644
> --- a/meta/recipes-devtools/gdb/gdb-7.6.inc
> +++ b/meta/recipes-devtools/gdb/gdb-7.6.inc
> @@ -4,6 +4,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
>  		    file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \
>  		    file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674"
>  
> +SRC_URI += " file://gdb-fix-cygwin-check-in-configure-script.patch "
> +
>  S = "${WORKDIR}/${BPN}-${PV}"
>  
>  SRC_URI[md5sum] = "a9836707337e5f7bf76a009a8904f470"
> 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 0000000..4e4647b
> --- /dev/null
> +++ b/meta/recipes-devtools/gdb/gdb/gdb-fix-cygwin-check-in-configure-script.patch
> @@ -0,0 +1,38 @@
> +Avoid false positives if the search pattern "lose" is found in path
> +descriptions in comments generated by the preprocessor.
> +
> +See <https://sourceware.org/bugzilla/show_bug.cgi?id=16152>.
> +---
> + gdb/configure    | 2 +-
> + gdb/configure.ac | 2 +-
> + 3 files changed, 7 insertions(+), 2 deletions(-)
> +
> +diff --git a/gdb/configure b/gdb/configure
> +index 5514b2f..b38e183 100755
> +--- a/gdb/configure
> ++++ b/gdb/configure
> +@@ -12446,7 +12446,7 @@ lose
> + #endif
> + _ACEOF
> + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
> +-  $EGREP "lose" >/dev/null 2>&1; then :
> ++  $EGREP "^lose$" >/dev/null 2>&1; then :
> +   gdb_cv_os_cygwin=yes
> + else
> +   gdb_cv_os_cygwin=no
> +diff --git a/gdb/configure.ac b/gdb/configure.ac
> +index 9b73887..2947293 100644
> +--- a/gdb/configure.ac
> ++++ b/gdb/configure.ac
> +@@ -1877,7 +1877,7 @@ AC_SUBST(WERROR_CFLAGS)
> + 
> + # In the Cygwin environment, we need some additional flags.
> + AC_CACHE_CHECK([for cygwin], gdb_cv_os_cygwin,
> +-[AC_EGREP_CPP(lose, [
> ++[AC_EGREP_CPP(^lose$, [
> + #if defined (__CYGWIN__) || defined (__CYGWIN32__)
> + lose
> + #endif],[gdb_cv_os_cygwin=yes],[gdb_cv_os_cygwin=no])])
> +-- 
> +1.8.4
> +
> 

Ping!

Robert, are you still there?
Robert Yang - Dec. 10, 2013, 9:15 a.m.
Thanks, applied to dora-next.

// Robert

On 12/09/2013 10:47 PM, Steffen Sledz wrote:
> On 28.11.2013 15:09, Steffen Sledz wrote:
>> 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
>> Signed-off-by: Steffen Sledz <sledz@dresearch-fe.de>
>> ---
>>   meta/recipes-devtools/gdb/gdb-7.6.inc              |  2 ++
>>   .../gdb-fix-cygwin-check-in-configure-script.patch | 38 ++++++++++++++++++++++
>>   2 files changed, 40 insertions(+)
>>   create mode 100644 meta/recipes-devtools/gdb/gdb/gdb-fix-cygwin-check-in-configure-script.patch
>>
>> diff --git a/meta/recipes-devtools/gdb/gdb-7.6.inc b/meta/recipes-devtools/gdb/gdb-7.6.inc
>> index 00cb6ee..9be94b8 100644
>> --- a/meta/recipes-devtools/gdb/gdb-7.6.inc
>> +++ b/meta/recipes-devtools/gdb/gdb-7.6.inc
>> @@ -4,6 +4,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
>>   		    file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \
>>   		    file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674"
>>
>> +SRC_URI += " file://gdb-fix-cygwin-check-in-configure-script.patch "
>> +
>>   S = "${WORKDIR}/${BPN}-${PV}"
>>
>>   SRC_URI[md5sum] = "a9836707337e5f7bf76a009a8904f470"
>> 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 0000000..4e4647b
>> --- /dev/null
>> +++ b/meta/recipes-devtools/gdb/gdb/gdb-fix-cygwin-check-in-configure-script.patch
>> @@ -0,0 +1,38 @@
>> +Avoid false positives if the search pattern "lose" is found in path
>> +descriptions in comments generated by the preprocessor.
>> +
>> +See <https://sourceware.org/bugzilla/show_bug.cgi?id=16152>.
>> +---
>> + gdb/configure    | 2 +-
>> + gdb/configure.ac | 2 +-
>> + 3 files changed, 7 insertions(+), 2 deletions(-)
>> +
>> +diff --git a/gdb/configure b/gdb/configure
>> +index 5514b2f..b38e183 100755
>> +--- a/gdb/configure
>> ++++ b/gdb/configure
>> +@@ -12446,7 +12446,7 @@ lose
>> + #endif
>> + _ACEOF
>> + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
>> +-  $EGREP "lose" >/dev/null 2>&1; then :
>> ++  $EGREP "^lose$" >/dev/null 2>&1; then :
>> +   gdb_cv_os_cygwin=yes
>> + else
>> +   gdb_cv_os_cygwin=no
>> +diff --git a/gdb/configure.ac b/gdb/configure.ac
>> +index 9b73887..2947293 100644
>> +--- a/gdb/configure.ac
>> ++++ b/gdb/configure.ac
>> +@@ -1877,7 +1877,7 @@ AC_SUBST(WERROR_CFLAGS)
>> +
>> + # In the Cygwin environment, we need some additional flags.
>> + AC_CACHE_CHECK([for cygwin], gdb_cv_os_cygwin,
>> +-[AC_EGREP_CPP(lose, [
>> ++[AC_EGREP_CPP(^lose$, [
>> + #if defined (__CYGWIN__) || defined (__CYGWIN32__)
>> + lose
>> + #endif],[gdb_cv_os_cygwin=yes],[gdb_cv_os_cygwin=no])])
>> +--
>> +1.8.4
>> +
>>
>
> Ping!
>
> Robert, are you still there?
>
Steffen Sledz - Dec. 11, 2013, 8:17 a.m.
On 10.12.2013 10:15, Robert Yang wrote:
> Thanks, applied to dora-next.

Great. Thanx.

Just for my understanding. May be i somehow overlooked relevant announcements.

* Where is the dora-next branch available (not at git://git.openembedded.org/openembedded-core if i'm looking right)?
* And what is the policy about dora-next and dora?

Steffen
Robert Yang - Dec. 11, 2013, 8:58 a.m.
On 12/11/2013 04:17 PM, Steffen Sledz wrote:
> On 10.12.2013 10:15, Robert Yang wrote:
>> Thanks, applied to dora-next.
>
> Great. Thanx.
>
> Just for my understanding. May be i somehow overlooked relevant announcements.
>
> * Where is the dora-next branch available (not at git://git.openembedded.org/openembedded-core if i'm looking right)?

The dora-next is still in developing, not stable if you need the dev
branch, it is here:

# For poky:
git://git.pokylinux.org/poky-contrib robert/dora-next

# For oe-core only:
git://git.pokylinux.org/poky-contrib robert/dora-next-oecore

> * And what is the policy about dora-next and dora?
>

dora is the stable branch, dora-next isn't, dora-next is based on
dora, it will be merged into dora when reviewed and approved.

// Robert

> Steffen
>

Patch

diff --git a/meta/recipes-devtools/gdb/gdb-7.6.inc b/meta/recipes-devtools/gdb/gdb-7.6.inc
index 00cb6ee..9be94b8 100644
--- a/meta/recipes-devtools/gdb/gdb-7.6.inc
+++ b/meta/recipes-devtools/gdb/gdb-7.6.inc
@@ -4,6 +4,8 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
 		    file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \
 		    file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674"
 
+SRC_URI += " file://gdb-fix-cygwin-check-in-configure-script.patch "
+
 S = "${WORKDIR}/${BPN}-${PV}"
 
 SRC_URI[md5sum] = "a9836707337e5f7bf76a009a8904f470"
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 0000000..4e4647b
--- /dev/null
+++ b/meta/recipes-devtools/gdb/gdb/gdb-fix-cygwin-check-in-configure-script.patch
@@ -0,0 +1,38 @@ 
+Avoid false positives if the search pattern "lose" is found in path
+descriptions in comments generated by the preprocessor.
+
+See <https://sourceware.org/bugzilla/show_bug.cgi?id=16152>.
+---
+ gdb/configure    | 2 +-
+ gdb/configure.ac | 2 +-
+ 3 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/gdb/configure b/gdb/configure
+index 5514b2f..b38e183 100755
+--- a/gdb/configure
++++ b/gdb/configure
+@@ -12446,7 +12446,7 @@ lose
+ #endif
+ _ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  $EGREP "lose" >/dev/null 2>&1; then :
++  $EGREP "^lose$" >/dev/null 2>&1; then :
+   gdb_cv_os_cygwin=yes
+ else
+   gdb_cv_os_cygwin=no
+diff --git a/gdb/configure.ac b/gdb/configure.ac
+index 9b73887..2947293 100644
+--- a/gdb/configure.ac
++++ b/gdb/configure.ac
+@@ -1877,7 +1877,7 @@ AC_SUBST(WERROR_CFLAGS)
+ 
+ # In the Cygwin environment, we need some additional flags.
+ AC_CACHE_CHECK([for cygwin], gdb_cv_os_cygwin,
+-[AC_EGREP_CPP(lose, [
++[AC_EGREP_CPP(^lose$, [
+ #if defined (__CYGWIN__) || defined (__CYGWIN32__)
+ lose
+ #endif],[gdb_cv_os_cygwin=yes],[gdb_cv_os_cygwin=no])])
+-- 
+1.8.4
+