tag #603347 + patch
user #603347 ubuntu-de...@lists.ubuntu.com
usertag #603347 + ubuntu-patch natty origin-ubuntu
stop
Debdiff attached; built natively on i386 amd64 armel and powerpc and
created a cross-gdb for armel on i386 and amd64; tested the cross-gdb
on i386 successfully.
--
Loïc Minier
diff -Nru gdb-7.2/debian/changelog gdb-7.2/debian/changelog
--- gdb-7.2/debian/changelog 2010-12-10 19:37:23.000000000 +0100
+++ gdb-7.2/debian/changelog 2011-01-17 23:01:24.000000000 +0100
@@ -1,3 +1,11 @@
+gdb (7.2-1ubuntu7) natty; urgency=low
+
+ * Pass --gdb-datadir=/usr/share/gdb-$triplet when building a cross-gdb and
+ update gdb.install sed snippet to match; fixes conflict with gdb;
+ Debian #603347.
+
+ -- Loïc Minier <loic.min...@linaro.org> Mon, 17 Jan 2011 17:50:20 +0100
+
gdb (7.2-1ubuntu6) natty; urgency=low
* Add support to "gcore" command for executables with GNU_RELRO
diff -Nru gdb-7.2/debian/rules gdb-7.2/debian/rules
--- gdb-7.2/debian/rules 2010-09-06 13:40:25.000000000 +0200
+++ gdb-7.2/debian/rules 2011-01-17 22:31:36.000000000 +0100
@@ -45,6 +45,11 @@
-a$(DEB_TARGET_ARCH) -qDEB_HOST_GNU_TYPE 2>/dev/null)
DEB_TARGET_ALIAS ?= $(DEB_TARGET_GNU_TYPE)
+ifneq ($(GDB_TARGET),)
+DEB_CONFIGURE_GDB_DATADIR := "\$${prefix}/share/gdb-$(DEB_TARGET_GNU_TYPE)"
+DEB_CONFIGURE_PATH_ARGS += --with-gdb-datadir=$(DEB_CONFIGURE_GDB_DATADIR)
+endif
+
ifeq ($(DEB_TARGET_ARCH),)
$(error GDB_TARGET value "$(GDB_TARGET)" is not a valid Debian architecture)
endif
@@ -264,7 +269,7 @@
> debian/control
ifeq ($(DEB_CROSS),yes)
sed -i "/Package: gdb64/,\$$ d" debian/control
- sed "s+/gdb+/$(TP)gdb+g; s+usr/share/$(TP)gdb+usr/share/gdb+g" \
+ sed "s+/gdb+/$(TP)gdb+g; s+usr/share/$(TP)gdb+usr/share/gdb$(TS)+g" \
debian/gdb.install > debian/gdb$(TS).install
endif
