From: Joel Brobecker <brobecker@gnat.com>
Date: Wed, 30 Jun 2010 23:12:04 +0000 (+0000)
Subject: Fix build failure with Python installed in non-system location.
X-Git-Tag: gdb_7_2-2010-07-07-branchpoint~82
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=aac63f0f2626a3fce5ee936f07ecb48ab7b12ca8;p=external%2Fbinutils.git

Fix build failure with Python installed in non-system location.

The debugger fails to build when configure with --python-python=<path>
where <path> is a non-system location.  The reason is a warning made
fatal due to the definition of _XOPEN_SOURCE inside pyconfig.h.  This
is exactly the same problem as with _POSIX_C_SOURCE, handled in
python-internal.h as follow:

| /* /usr/include/features.h on linux systems will define _POSIX_C_SOURCE
|    if it sees _GNU_SOURCE (which config.h will define).
|    pyconfig.h defines _POSIX_C_SOURCE to a different value than
|    /usr/include/features.h does causing compilation to fail.
|    To work around this, undef _POSIX_C_SOURCE before we include Python.h.  */
| #undef _POSIX_C_SOURCE

This patch fixes this problem the same way.

2010-06-30  Joel Brobecker  <brobecker@adacore.com>

        * python/python-internal.h (_XOPEN_SOURCE): Undefine before
        including Python.h.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b3f6fc5..30802c1 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-30  Joel Brobecker  <brobecker@adacore.com>
+
+	* python/python-internal.h (_XOPEN_SOURCE): Undefine before
+	including Python.h.
+
 2010-06-29  Doug Evans  <dje@google.com>
 
 	PR gdb/11702
diff --git a/gdb/python/python-internal.h b/gdb/python/python-internal.h
index daaed2c..630d191 100644
--- a/gdb/python/python-internal.h
+++ b/gdb/python/python-internal.h
@@ -30,8 +30,11 @@
    if it sees _GNU_SOURCE (which config.h will define).
    pyconfig.h defines _POSIX_C_SOURCE to a different value than
    /usr/include/features.h does causing compilation to fail.
-   To work around this, undef _POSIX_C_SOURCE before we include Python.h.  */
+   To work around this, undef _POSIX_C_SOURCE before we include Python.h.
+
+   Same problem with _XOPEN_SOURCE.  */
 #undef _POSIX_C_SOURCE
+#undef _XOPEN_SOURCE
 
 #if HAVE_LIBPYTHON2_4
 #include "python2.4/Python.h"