From a0f23c6b9e5956e2e3ef3c465900a2d294db2fb4 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 4 Apr 2008 15:18:57 +0000 Subject: gdb: upgraded to 6.8 git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4174 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- meta/packages/gdb/files/no-werror.patch | 96 +++++++++++++++++++++++++++++++++ meta/packages/gdb/gdb-common.inc | 3 +- meta/packages/gdb/gdb-cross-sdk_6.6.bb | 7 --- meta/packages/gdb/gdb-cross-sdk_6.8.bb | 7 +++ meta/packages/gdb/gdb-cross_6.6.bb | 7 --- meta/packages/gdb/gdb-cross_6.8.bb | 7 +++ meta/packages/gdb/gdb.inc | 2 +- meta/packages/gdb/gdb_6.6.bb | 3 -- meta/packages/gdb/gdb_6.8.bb | 3 ++ 9 files changed, 116 insertions(+), 19 deletions(-) create mode 100644 meta/packages/gdb/files/no-werror.patch delete mode 100644 meta/packages/gdb/gdb-cross-sdk_6.6.bb create mode 100644 meta/packages/gdb/gdb-cross-sdk_6.8.bb delete mode 100644 meta/packages/gdb/gdb-cross_6.6.bb create mode 100644 meta/packages/gdb/gdb-cross_6.8.bb delete mode 100644 meta/packages/gdb/gdb_6.6.bb create mode 100644 meta/packages/gdb/gdb_6.8.bb (limited to 'meta') 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 @@ +--- + bfd/warning.m4 | 2 +- + configure.ac | 2 +- + gdb/Makefile.in | 4 ++-- + gdb/configure.ac | 8 ++------ + 4 files changed, 6 insertions(+), 10 deletions(-) + +--- gdb-6.8.orig/bfd/warning.m4 ++++ gdb-6.8/bfd/warning.m4 +@@ -21,11 +21,11 @@ case "${host}" in + *) ;; + esac + + # Enable -Werror by default when using gcc + if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then +- ERROR_ON_WARNING=yes ++ ERROR_ON_WARNING=no + fi + + NO_WERROR= + if test "${ERROR_ON_WARNING}" = yes ; then + GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Werror" +--- gdb-6.8.orig/configure.ac ++++ gdb-6.8/configure.ac +@@ -2739,11 +2739,11 @@ AC_SUBST(stage1_checking) + + # Enable -Werror in bootstrap stage2 and later. + AC_ARG_ENABLE(werror, + [ --enable-werror enable -Werror in bootstrap stage2 and later], [], + [if test -d ${srcdir}/gcc && test x"`cat $srcdir/gcc/DEV-PHASE`" = xexperimental; then +- enable_werror=yes ++ enable_werror=no + else + enable_werror=no + fi]) + case ${enable_werror} in + yes) stage2_werror_flag="--enable-werror-always" ;; +--- gdb-6.8.orig/gdb/Makefile.in ++++ gdb-6.8/gdb/Makefile.in +@@ -140,13 +140,13 @@ READLINE_CFLAGS = @READLINE_CFLAGS@ + + # Where is expat? This will be empty if expat was not available. + LIBEXPAT = @LIBEXPAT@ + + WARN_CFLAGS = @WARN_CFLAGS@ +-WERROR_CFLAGS = @WERROR_CFLAGS@ ++WERROR_CFLAGS = + GDB_WARN_CFLAGS = $(WARN_CFLAGS) +-GDB_WERROR_CFLAGS = $(WERROR_CFLAGS) ++GDB_WERROR_CFLAGS = + + GDB_WARN_CFLAGS_NO_FORMAT = `echo " $(GDB_WARN_CFLAGS) " | sed "s/ -Wformat-nonliteral / /g"` + + # Where is the INTL library? Typically in ../intl. + INTL = @LIBINTL@ +--- gdb-6.8.orig/gdb/configure.ac ++++ gdb-6.8/gdb/configure.ac +@@ -1292,24 +1292,21 @@ AC_SUBST(TARGET_SYSTEM_ROOT) + AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) + + AC_ARG_ENABLE(werror, + [ --enable-werror treat compile warnings as errors], + [case "${enableval}" in +- yes | y) ERROR_ON_WARNING="yes" ;; ++ yes | y) ERROR_ON_WARNING="no" ;; + no | n) ERROR_ON_WARNING="no" ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-werror) ;; + esac]) + + # Enable -Werror by default when using gcc + if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then +- ERROR_ON_WARNING=yes ++ ERROR_ON_WARNING=no + fi + + WERROR_CFLAGS="" +-if test "${ERROR_ON_WARNING}" = yes ; then +- WERROR_CFLAGS="-Werror" +-fi + + # The entries after -Wno-pointer-sign are disabled warnings which may + # be enabled in the future, which can not currently be used to build + # GDB. + # NOTE: If you change this list, remember to update +@@ -1352,11 +1349,10 @@ then + AC_MSG_CHECKING(compiler warning flags) + # Separate out the -Werror flag as some files just cannot be + # compiled with it enabled. + for w in ${build_warnings}; do + case $w in +- -Werr*) WERROR_CFLAGS=-Werror ;; + *) # Check that GCC accepts it + saved_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $w" + AC_TRY_COMPILE([],[],WARN_CFLAGS="${WARN_CFLAGS} $w",) + 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" inherit autotools -SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.gz" +SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.gz \ + file://no-werror.patch;patch=1" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gdb-${PV}" diff --git a/meta/packages/gdb/gdb-cross-sdk_6.6.bb b/meta/packages/gdb/gdb-cross-sdk_6.6.bb deleted file mode 100644 index b96348959f..0000000000 --- a/meta/packages/gdb/gdb-cross-sdk_6.6.bb +++ /dev/null @@ -1,7 +0,0 @@ -require gdb-cross.inc - -inherit sdk - -do_stage() { - : -} diff --git a/meta/packages/gdb/gdb-cross-sdk_6.8.bb b/meta/packages/gdb/gdb-cross-sdk_6.8.bb new file mode 100644 index 0000000000..b96348959f --- /dev/null +++ b/meta/packages/gdb/gdb-cross-sdk_6.8.bb @@ -0,0 +1,7 @@ +require gdb-cross.inc + +inherit sdk + +do_stage() { + : +} diff --git a/meta/packages/gdb/gdb-cross_6.6.bb b/meta/packages/gdb/gdb-cross_6.6.bb deleted file mode 100644 index c6992e4b6a..0000000000 --- a/meta/packages/gdb/gdb-cross_6.6.bb +++ /dev/null @@ -1,7 +0,0 @@ -require gdb-cross.inc - -SRC_URI += "file://sim-install-6.6.patch;patch=1" - -inherit cross - -PR = "r1" \ No newline at end of file diff --git a/meta/packages/gdb/gdb-cross_6.8.bb b/meta/packages/gdb/gdb-cross_6.8.bb new file mode 100644 index 0000000000..c6992e4b6a --- /dev/null +++ b/meta/packages/gdb/gdb-cross_6.8.bb @@ -0,0 +1,7 @@ +require gdb-cross.inc + +SRC_URI += "file://sim-install-6.6.patch;patch=1" + +inherit cross + +PR = "r1" \ No newline at end of file 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 SRC_URI += "file://kill_arm_map_symbols.patch;patch=1 \ file://gdbserver-cflags-last.diff;patch=1;pnum=0 \ - file://ignore_whitespace_changes.patch;patch=1" + file://ignore_whitespace_changes.patch;patch=1 " #FIXME file://uclibc.patch;patch=1 \ 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.6.bb deleted file mode 100644 index 988cfb4c44..0000000000 --- a/meta/packages/gdb/gdb_6.6.bb +++ /dev/null @@ -1,3 +0,0 @@ -require gdb.inc - -PR = "r4" diff --git a/meta/packages/gdb/gdb_6.8.bb b/meta/packages/gdb/gdb_6.8.bb new file mode 100644 index 0000000000..988cfb4c44 --- /dev/null +++ b/meta/packages/gdb/gdb_6.8.bb @@ -0,0 +1,3 @@ +require gdb.inc + +PR = "r4" -- cgit v1.2.3-54-g00ecf