diff options
author | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-04-04 15:18:57 +0000 |
---|---|---|
committer | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-04-04 15:18:57 +0000 |
commit | a0f23c6b9e5956e2e3ef3c465900a2d294db2fb4 (patch) | |
tree | a4ab855064f2ba89a865fd0c9a47919fb9040d14 | |
parent | 98eb6feeb643977694ddd8ba88bf35f9df114d26 (diff) | |
download | poky-a0f23c6b9e5956e2e3ef3c465900a2d294db2fb4.tar.gz |
gdb: upgraded to 6.8
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4174 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r-- | meta/packages/gdb/files/no-werror.patch | 96 | ||||
-rw-r--r-- | meta/packages/gdb/gdb-common.inc | 3 | ||||
-rw-r--r-- | meta/packages/gdb/gdb-cross-sdk_6.8.bb (renamed from meta/packages/gdb/gdb-cross-sdk_6.6.bb) | 0 | ||||
-rw-r--r-- | meta/packages/gdb/gdb-cross_6.8.bb (renamed from meta/packages/gdb/gdb-cross_6.6.bb) | 0 | ||||
-rw-r--r-- | meta/packages/gdb/gdb.inc | 2 | ||||
-rw-r--r-- | meta/packages/gdb/gdb_6.8.bb (renamed from meta/packages/gdb/gdb_6.6.bb) | 0 |
6 files changed, 99 insertions, 2 deletions
diff --git a/meta/packages/gdb/files/no-werror.patch b/meta/packages/gdb/files/no-werror.patch new file mode 100644 index 0000000000..0a9faa2d1d --- /dev/null +++ b/meta/packages/gdb/files/no-werror.patch | |||
@@ -0,0 +1,96 @@ | |||
1 | --- | ||
2 | bfd/warning.m4 | 2 +- | ||
3 | configure.ac | 2 +- | ||
4 | gdb/Makefile.in | 4 ++-- | ||
5 | gdb/configure.ac | 8 ++------ | ||
6 | 4 files changed, 6 insertions(+), 10 deletions(-) | ||
7 | |||
8 | --- gdb-6.8.orig/bfd/warning.m4 | ||
9 | +++ gdb-6.8/bfd/warning.m4 | ||
10 | @@ -21,11 +21,11 @@ case "${host}" in | ||
11 | *) ;; | ||
12 | esac | ||
13 | |||
14 | # Enable -Werror by default when using gcc | ||
15 | if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then | ||
16 | - ERROR_ON_WARNING=yes | ||
17 | + ERROR_ON_WARNING=no | ||
18 | fi | ||
19 | |||
20 | NO_WERROR= | ||
21 | if test "${ERROR_ON_WARNING}" = yes ; then | ||
22 | GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Werror" | ||
23 | --- gdb-6.8.orig/configure.ac | ||
24 | +++ gdb-6.8/configure.ac | ||
25 | @@ -2739,11 +2739,11 @@ AC_SUBST(stage1_checking) | ||
26 | |||
27 | # Enable -Werror in bootstrap stage2 and later. | ||
28 | AC_ARG_ENABLE(werror, | ||
29 | [ --enable-werror enable -Werror in bootstrap stage2 and later], [], | ||
30 | [if test -d ${srcdir}/gcc && test x"`cat $srcdir/gcc/DEV-PHASE`" = xexperimental; then | ||
31 | - enable_werror=yes | ||
32 | + enable_werror=no | ||
33 | else | ||
34 | enable_werror=no | ||
35 | fi]) | ||
36 | case ${enable_werror} in | ||
37 | yes) stage2_werror_flag="--enable-werror-always" ;; | ||
38 | --- gdb-6.8.orig/gdb/Makefile.in | ||
39 | +++ gdb-6.8/gdb/Makefile.in | ||
40 | @@ -140,13 +140,13 @@ READLINE_CFLAGS = @READLINE_CFLAGS@ | ||
41 | |||
42 | # Where is expat? This will be empty if expat was not available. | ||
43 | LIBEXPAT = @LIBEXPAT@ | ||
44 | |||
45 | WARN_CFLAGS = @WARN_CFLAGS@ | ||
46 | -WERROR_CFLAGS = @WERROR_CFLAGS@ | ||
47 | +WERROR_CFLAGS = | ||
48 | GDB_WARN_CFLAGS = $(WARN_CFLAGS) | ||
49 | -GDB_WERROR_CFLAGS = $(WERROR_CFLAGS) | ||
50 | +GDB_WERROR_CFLAGS = | ||
51 | |||
52 | GDB_WARN_CFLAGS_NO_FORMAT = `echo " $(GDB_WARN_CFLAGS) " | sed "s/ -Wformat-nonliteral / /g"` | ||
53 | |||
54 | # Where is the INTL library? Typically in ../intl. | ||
55 | INTL = @LIBINTL@ | ||
56 | --- gdb-6.8.orig/gdb/configure.ac | ||
57 | +++ gdb-6.8/gdb/configure.ac | ||
58 | @@ -1292,24 +1292,21 @@ AC_SUBST(TARGET_SYSTEM_ROOT) | ||
59 | AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) | ||
60 | |||
61 | AC_ARG_ENABLE(werror, | ||
62 | [ --enable-werror treat compile warnings as errors], | ||
63 | [case "${enableval}" in | ||
64 | - yes | y) ERROR_ON_WARNING="yes" ;; | ||
65 | + yes | y) ERROR_ON_WARNING="no" ;; | ||
66 | no | n) ERROR_ON_WARNING="no" ;; | ||
67 | *) AC_MSG_ERROR(bad value ${enableval} for --enable-werror) ;; | ||
68 | esac]) | ||
69 | |||
70 | # Enable -Werror by default when using gcc | ||
71 | if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then | ||
72 | - ERROR_ON_WARNING=yes | ||
73 | + ERROR_ON_WARNING=no | ||
74 | fi | ||
75 | |||
76 | WERROR_CFLAGS="" | ||
77 | -if test "${ERROR_ON_WARNING}" = yes ; then | ||
78 | - WERROR_CFLAGS="-Werror" | ||
79 | -fi | ||
80 | |||
81 | # The entries after -Wno-pointer-sign are disabled warnings which may | ||
82 | # be enabled in the future, which can not currently be used to build | ||
83 | # GDB. | ||
84 | # NOTE: If you change this list, remember to update | ||
85 | @@ -1352,11 +1349,10 @@ then | ||
86 | AC_MSG_CHECKING(compiler warning flags) | ||
87 | # Separate out the -Werror flag as some files just cannot be | ||
88 | # compiled with it enabled. | ||
89 | for w in ${build_warnings}; do | ||
90 | case $w in | ||
91 | - -Werr*) WERROR_CFLAGS=-Werror ;; | ||
92 | *) # Check that GCC accepts it | ||
93 | saved_CFLAGS="$CFLAGS" | ||
94 | CFLAGS="$CFLAGS $w" | ||
95 | AC_TRY_COMPILE([],[],WARN_CFLAGS="${WARN_CFLAGS} $w",) | ||
96 | CFLAGS="$saved_CFLAGS" | ||
diff --git a/meta/packages/gdb/gdb-common.inc b/meta/packages/gdb/gdb-common.inc index 0c236925dc..bb3a28a151 100644 --- a/meta/packages/gdb/gdb-common.inc +++ b/meta/packages/gdb/gdb-common.inc | |||
@@ -6,7 +6,8 @@ PRIORITY = "optional" | |||
6 | 6 | ||
7 | inherit autotools | 7 | inherit autotools |
8 | 8 | ||
9 | SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.gz" | 9 | SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.gz \ |
10 | file://no-werror.patch;patch=1" | ||
10 | 11 | ||
11 | FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gdb-${PV}" | 12 | FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gdb-${PV}" |
12 | 13 | ||
diff --git a/meta/packages/gdb/gdb-cross-sdk_6.6.bb b/meta/packages/gdb/gdb-cross-sdk_6.8.bb index b96348959f..b96348959f 100644 --- a/meta/packages/gdb/gdb-cross-sdk_6.6.bb +++ b/meta/packages/gdb/gdb-cross-sdk_6.8.bb | |||
diff --git a/meta/packages/gdb/gdb-cross_6.6.bb b/meta/packages/gdb/gdb-cross_6.8.bb index c6992e4b6a..c6992e4b6a 100644 --- a/meta/packages/gdb/gdb-cross_6.6.bb +++ b/meta/packages/gdb/gdb-cross_6.8.bb | |||
diff --git a/meta/packages/gdb/gdb.inc b/meta/packages/gdb/gdb.inc index 1af156ca03..c32c6cf143 100644 --- a/meta/packages/gdb/gdb.inc +++ b/meta/packages/gdb/gdb.inc | |||
@@ -12,7 +12,7 @@ inherit gettext | |||
12 | 12 | ||
13 | SRC_URI += "file://kill_arm_map_symbols.patch;patch=1 \ | 13 | SRC_URI += "file://kill_arm_map_symbols.patch;patch=1 \ |
14 | file://gdbserver-cflags-last.diff;patch=1;pnum=0 \ | 14 | file://gdbserver-cflags-last.diff;patch=1;pnum=0 \ |
15 | file://ignore_whitespace_changes.patch;patch=1" | 15 | file://ignore_whitespace_changes.patch;patch=1 " |
16 | #FIXME file://uclibc.patch;patch=1 \ | 16 | #FIXME file://uclibc.patch;patch=1 \ |
17 | 17 | ||
18 | EXTRA_OEMAKE = "'SUBDIRS=intl mmalloc libiberty opcodes bfd sim gdb etc utils'" | 18 | EXTRA_OEMAKE = "'SUBDIRS=intl mmalloc libiberty opcodes bfd sim gdb etc utils'" |
diff --git a/meta/packages/gdb/gdb_6.6.bb b/meta/packages/gdb/gdb_6.8.bb index 988cfb4c44..988cfb4c44 100644 --- a/meta/packages/gdb/gdb_6.6.bb +++ b/meta/packages/gdb/gdb_6.8.bb | |||