[Crosstoolchain-logs] [SCM] GNU GDB Debian packaging repository branch, master, updated. debian/7.4-1_cvs20111117-2-g83de4fa
Hector Oron
hector.oron at gmail.com
Fri Nov 18 20:33:06 UTC 2011
The following commit has been merged in the master branch:
commit 4ade426af13c8b41dce3b2c92c31202a4dc68a8d
Author: Hector Oron <zumbi at debian.org>
Date: Thu Nov 17 18:37:45 2011 +0000
Imported Debian patch 7.4-1~cvs20111117.1
diff --git a/debian/changelog b/debian/changelog
index 2f0141a..32b91de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+gdb (7.4-1~cvs20111117.1) experimental; urgency=low
+
+ * Add accidentally dropped armhf to architecture list
+ * Add GDB debug package (Closes: #592512, #490049)
+ * Provide GDB multiarch package (Closes: #610519)
+ - Add gdb-multiarch package supporting extra bfd targets similarly to
+ binutils-multiarch; the package is constructed much like gdb64 except that
+ it's build with the gdb configure flags and --enable-targets=all for now.
+ - Thanks Loïc Minier.
+ * Fix conflicts between cross and regular gdb (Closes: #603347)
+ - Pass --gdb-datadir=/usr/share/gdb-$triplet when building a cross-gdb and
+ update gdb.install sed snippet to match; fixes conflict with gdb;
+ - Thanks Loïc Minier.
+
+ -- Hector Oron <zumbi at debian.org> Thu, 17 Nov 2011 18:37:45 +0000
+
gdb (7.4-1~cvs20111117) experimental; urgency=low
* CVS snapshot release (20111117)
diff --git a/debian/control b/debian/control
index 05348c2..82c616c 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Section: devel
Priority: optional
Standards-Version: 3.9.2
Build-Depends: autoconf, libtool, texinfo (>= 4.7-2.2), texlive-base,
- libncurses5-dev, libreadline-dev, bison, gettext, debhelper (>= 7),
+ libncurses5-dev, libreadline-dev, bison, gettext, debhelper (>= 7.0.50),
dejagnu, gcj-jdk | gcj, gobjc, mig [hurd-any], cdbs (>= 0.4.17),
libkvm-dev [kfreebsd-any], libunwind7-dev [ia64],
flex | flex-old, libexpat1-dev, g++-multilib [i386 powerpc s390 sparc],
@@ -19,7 +19,7 @@ Package: gdb
Architecture: any
Section: devel
Depends: ${shlibs:Depends}, ${misc:Depends},
- gdbserver [amd64 armel i386 ia64 mips mipsel powerpc s390]
+ gdbserver [amd64 armel armhf i386 ia64 mips mipsel powerpc s390]
Suggests: gdb-doc
Description: The GNU Debugger
GDB is a source-level debugger, capable of breaking programs at
@@ -28,6 +28,20 @@ Description: The GNU Debugger
Objective-C, Fortran, Java, OpenCL C, Pascal, assembly, Modula-2,
and Ada. A must-have for any serious programmer.
+Package: gdb-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Depends: gdb (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Description: debugging symbols for the GNU Debugger
+ GDB is a source-level debugger, capable of breaking programs at
+ any specific line, displaying variable values, and determining
+ where errors occurred. Currently, gdb supports C, C++, D,
+ Objective-C, Fortran, Java, OpenCL C, Pascal, assembly, Modula-2,
+ and Ada. A must-have for any serious programmer.
+ .
+ This package contains the debugging symbols for GDB.
+
Package: gdb-minimal
Architecture: any
Section: devel
@@ -46,7 +60,7 @@ Description: The GNU Debugger
Package: gdb64
Architecture: i386 powerpc s390 sparc
Section: devel
-Depends: ${shlibs:Depends}, gdb, ${misc:Depends}
+Depends: ${shlibs:Depends}, gdb(= ${binary:Version}), ${misc:Depends}
Description: The GNU Debugger (64-bit)
GDB is a source-level debugger, capable of breaking programs at
any specific line, displaying variable values, and determining
@@ -54,8 +68,22 @@ Description: The GNU Debugger (64-bit)
Objective-C, Fortran, Java, OpenCL C, Pascal, assembly, Modula-2,
and Ada. A must-have for any serious programmer.
+Package: gdb-multiarch
+Architecture: any
+Section: devel
+Depends: ${shlibs:Depends}, gdb , ${misc:Depends}
+Description: The GNU Debugger (with support for multiple architectures)
+ GDB is a source-level debugger, capable of breaking programs at
+ any specific line, displaying variable values, and determining
+ where errors occurred. Currently, it works for C, C++, Fortran
+ Modula 2 and Java programs. A must-have for any serious
+ programmer.
+ .
+ This package contains a version of GDB which supports multiple
+ target architectures.
+
Package: gdbserver
-Architecture: amd64 armel i386 ia64 mips mipsel powerpc s390
+Architecture: amd64 armel armhf i386 ia64 mips mipsel powerpc s390
Section: devel
Depends: ${shlibs:Depends}, ${misc:Depends}
Replaces: gdb (<< 7.0.1-1)
diff --git a/debian/control.in b/debian/control.in
index ed06a32..2b58bb9 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -5,7 +5,7 @@ Section: devel
Priority: optional
Standards-Version: 3.9.2
Build-Depends: autoconf, libtool, texinfo (>= 4.7-2.2), texlive-base,
- libncurses5-dev, libreadline-dev, bison, gettext, debhelper (>= 7),
+ libncurses5-dev, libreadline-dev, bison, gettext, debhelper (>= 7.0.50),
dejagnu, gcj-jdk | gcj, gobjc, mig [hurd-any], cdbs (>= 0.4.17),
libkvm-dev [kfreebsd-any], libunwind7-dev [ia64],
flex | flex-old, libexpat1-dev, g++-multilib [i386 powerpc s390 sparc],
@@ -19,7 +19,7 @@ Package: gdb at TS@
Architecture: any
Section: devel
Depends: ${shlibs:Depends}, ${misc:Depends},
- gdbserver [amd64 armel i386 ia64 mips mipsel powerpc s390]
+ gdbserver [amd64 armel armhf i386 ia64 mips mipsel powerpc s390]
Suggests: gdb-doc
Description: The GNU Debugger
GDB is a source-level debugger, capable of breaking programs at
@@ -28,6 +28,20 @@ Description: The GNU Debugger
Objective-C, Fortran, Java, OpenCL C, Pascal, assembly, Modula-2,
and Ada. A must-have for any serious programmer.
+Package: gdb-dbg at TS@
+Architecture: any
+Section: debug
+Priority: extra
+Depends: gdb (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Description: debugging symbols for the GNU Debugger
+ GDB is a source-level debugger, capable of breaking programs at
+ any specific line, displaying variable values, and determining
+ where errors occurred. Currently, gdb supports C, C++, D,
+ Objective-C, Fortran, Java, OpenCL C, Pascal, assembly, Modula-2,
+ and Ada. A must-have for any serious programmer.
+ .
+ This package contains the debugging symbols for GDB.
+
Package: gdb-minimal
Architecture: any
Section: devel
@@ -46,7 +60,7 @@ Description: The GNU Debugger
Package: gdb64
Architecture: i386 powerpc s390 sparc
Section: devel
-Depends: ${shlibs:Depends}, gdb, ${misc:Depends}
+Depends: ${shlibs:Depends}, gdb(= ${binary:Version}), ${misc:Depends}
Description: The GNU Debugger (64-bit)
GDB is a source-level debugger, capable of breaking programs at
any specific line, displaying variable values, and determining
@@ -54,8 +68,22 @@ Description: The GNU Debugger (64-bit)
Objective-C, Fortran, Java, OpenCL C, Pascal, assembly, Modula-2,
and Ada. A must-have for any serious programmer.
+Package: gdb-multiarch
+Architecture: any
+Section: devel
+Depends: ${shlibs:Depends}, gdb , ${misc:Depends}
+Description: The GNU Debugger (with support for multiple architectures)
+ GDB is a source-level debugger, capable of breaking programs at
+ any specific line, displaying variable values, and determining
+ where errors occurred. Currently, it works for C, C++, Fortran
+ Modula 2 and Java programs. A must-have for any serious
+ programmer.
+ .
+ This package contains a version of GDB which supports multiple
+ target architectures.
+
Package: gdbserver
-Architecture: amd64 armel i386 ia64 mips mipsel powerpc s390
+Architecture: amd64 armel armhf i386 ia64 mips mipsel powerpc s390
Section: devel
Depends: ${shlibs:Depends}, ${misc:Depends}
Replaces: gdb (<< 7.0.1-1)
diff --git a/debian/gdb-mutliarch/usr/share/man/man1/gdb64.1.gz b/debian/gdb-mutliarch/usr/share/man/man1/gdb64.1.gz
new file mode 120000
index 0000000..8c2e5b6
--- /dev/null
+++ b/debian/gdb-mutliarch/usr/share/man/man1/gdb64.1.gz
@@ -0,0 +1 @@
+gdb.1.gz
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index 2ff6f44..d532f91 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,7 @@ ALL_BUILDDIR := $(shell pwd)/build
DEB_BUILDDIR := $(ALL_BUILDDIR)/objdir
DEB_DH_INSTALL_SOURCEDIR := $(shell pwd)/debian/tmp
+DEB_DH_STRIP_ARGS := --dbg-package=gdb-dbg
# This implements the .deb package creation using debhelper.
include /usr/share/cdbs/1/rules/debhelper.mk
@@ -45,6 +46,11 @@ DEB_TARGET_GNU_TYPE := $(shell dpkg-architecture -f \
-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
@@ -79,6 +85,8 @@ ifneq (,$(filter $(DEB_HOST_ARCH),i386 powerpc sparc s390))
endif
endif
+BUILDDIRMULTIARCH = $(ALL_BUILDDIR)/objdir-multiarch
+
run_tests := yes
ifneq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
@@ -122,6 +130,40 @@ DEB_CONFIGURE_EXTRA_FLAGS := --host=$(DEB_HOST_GNU_TYPE) $(EXTRA_FLAGS) \
DEB_CONFIGURE_FLAGS_64 := --host=$(HOST64) $(EXTRA_FLAGS) \
--enable-tui
+# multiarch targets; this is taken from the binutils-multiarch package but
+# doesn't seem like a terribly nice list; see
+# <20110117211551.GA7216 at bee.dooz.org> for discussion -- locally updated
+#MULTIARCH_TARGETS := \
+# alpha-linux-gnu \
+# arm-linux-gnu \
+# arm-linux-gnueabi \
+# arm-linux-gnueabihf \
+# hppa-linux-gnu \
+# i686-linux-gnu \
+# ia64-linux-gnu \
+# m68k-linux-gnu \
+# m68k-rtems \
+# mips-linux-gnu \
+# mipsel-linux-gnu \
+# mips64-linux-gnu \
+# mips64el-linux-gnu \
+# powerpc-linux-gnu \
+# powerpcspe-linux-gnu \
+# ppc64-linux-gnu \
+# s390-linux-gnu \
+# s390x-linux-gnu \
+# sh-linux-gnu \
+# sh64-linux-gnu \
+# sparc-linux-gnu \
+# sparc64-linux-gnu \
+# x86_64-linux-gnu \
+# m32r-linux-gnu \
+# spu
+MULTIARCH_TARGETS := all
+# multiarch flags
+DEB_CONFIGURE_FLAGS_MULTIARCH := $(DEB_CONFIGURE_EXTRA_FLAGS) \
+ --enable-targets=`set -- $(MULTIARCH_TARGETS); IFS=,; echo "$$*"`
+
# Minimal flags
DEB_CONFIGURE_FLAGS_MIN := --host=$(DEB_HOST_GNU_TYPE) $(EXTRA_FLAGS) \
--disable-tui --without-expat --without-python
@@ -158,6 +200,14 @@ build64-stamp:
cd $(BUILDDIR64) && $(DEB_MAKE_ENVVARS) $(MAKE) $(NJOBS)
touch $@
+build/gdb-multiarch:: build-multiarch-stamp
+build-multiarch-stamp:
+ mkdir -p $(BUILDDIRMULTIARCH)
+ cd $(BUILDDIRMULTIARCH) && \
+ $(shell pwd)/configure $(DEB_CONFIGURE_FLAGS_MULTIARCH)
+ cd $(BUILDDIRMULTIARCH) && $(DEB_MAKE_ENVVARS) $(MAKE) $(NJOBS)
+ touch $@
+
build/gdb-minimal:: build-minimal-stamp
build-minimal-stamp:
mkdir -p $(BUILDDIRMIN)
@@ -174,7 +224,7 @@ endif
touch $@
clean::
- rm -f check-stamp build64-stamp
+ rm -f check-stamp build64-stamp build-multiarch-stamp
rm -rf $(ALL_BUILDDIR)
if test -f gdb/version.in.backup; then \
@@ -222,6 +272,13 @@ binary-post-install/gdb64 ::
rm -rf debian/gdb64/usr/share/doc/gdb64
ln -s gdb debian/gdb64/usr/share/doc/gdb64
+binary-post-install/gdb-multiarch ::
+ install -d debian/gdb-multiarch/usr/bin
+ install -s -m 755 $(BUILDDIRMULTIARCH)/gdb/gdb debian/gdb-multiarch/usr/bin/gdb-multiarch
+ dh_link -pgdb-mutliarch usr/share/man/man1/gdb.1.gz usr/share/man/man1/gdb64.1.gz
+ rm -rf debian/gdb-multiarch/usr/share/doc/gdb-multiarch
+ ln -s gdb debian/gdb-multiarch/usr/share/doc/gdb-multiarch
+
binary-post-install/gdb-minimal ::
install -d debian/gdb-minimal/usr/bin
$(INSTALL) -m 755 -o root -g root \
@@ -258,8 +315,8 @@ debian/control:: debian/control.in $(CROSS_FORCE)
| sed "s/@TS@/$(TS)/g" \
> 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 -i "/Package: gdb64/,\$$ d" -i "/Package: gdb-multiarch/,\$$ d" debian/control
+ sed "s+/gdb+/$(TP)gdb+g; s+usr/share/$(TP)gdb+usr/share/gdb$(TS)+g" \
debian/gdb.install > debian/gdb$(TS).install
endif
--
GNU GDB Debian packaging repository
More information about the Crosstoolchain-logs
mailing list