[Pkg-gdb-logs] [gdb] 01/01: new gdb-python2 package and enable babeltrace for supported arches.
Hector Oron
zumbi at moszumanska.debian.org
Mon Aug 25 14:21:46 UTC 2014
This is an automated email from the git hooks/post-receive script.
zumbi pushed a commit to branch master
in repository gdb.
commit 19921458721605cd59335c046dbee44db30ca720
Author: Héctor Orón Martínez <zumbi at debian.org>
Date: Mon Aug 25 16:14:52 2014 +0200
new gdb-python2 package and enable babeltrace for supported arches.
Signed-off-by: Héctor Orón Martínez <zumbi at debian.org>
---
debian/control | 23 ++++++++++++++++++++---
debian/control.in | 25 ++++++++++++++++++++++---
debian/rules | 50 +++++++++++++++++++++++++++++++++++++++++++++-----
3 files changed, 87 insertions(+), 11 deletions(-)
diff --git a/debian/control b/debian/control
index d314a4a..d2fe633 100644
--- a/debian/control
+++ b/debian/control
@@ -32,10 +32,11 @@ Build-Depends:
libreadline-dev, lib64readline6-dev [i386 powerpc s390 sparc],
zlib1g-dev,
liblzma-dev,
-# babeltrace doesn't build for hurd yet :-(
-# libbabeltrace-dev,
-# libbabeltrace-ctf-dev,
+ libbabeltrace-dev [amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390x],
+ libbabeltrace-ctf-dev [amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390x],
python-dev,
+# Python3 build
+ python3-dev,
libkvm-dev [kfreebsd-any],
libunwind7-dev [ia64],
Vcs-Git: git://anonscm.debian.org/pkg-gdb/gdb.git
@@ -58,6 +59,22 @@ Description: GNU Debugger
Objective-C, Fortran, Java, OpenCL C, Pascal, assembly, Modula-2,
Go, and Ada. A must-have for any serious programmer.
+Package: gdb-python2
+Architecture: any
+Depends: ${misc:Depends},
+ ${shlibs:Depends}
+Recommends: libc-dbg,
+ gdbserver [amd64 armel armhf arm64 i386 ia64 m32r m68k mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x x32]
+Suggests: gdb-doc
+Conflicts: gdb
+Replaces: gdb
+Description: 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,
+ Go, and Ada. A must-have for any serious programmer.
+
Package: gdb-minimal
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
diff --git a/debian/control.in b/debian/control.in
index ae37763..11f108a 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -19,7 +19,8 @@ Build-Depends:
flex | flex-old,
procps,
g++-multilib [i386 powerpc s390 sparc],
- gcj-jdk | gcj,
+# Do we really care that much about running the Java tests?
+# gcj-jdk | gcj,
gobjc,
mig [hurd-any],
# TeX[info] deps
@@ -31,8 +32,10 @@ Build-Depends:
libreadline-dev, lib64readline6-dev [i386 powerpc s390 sparc],
zlib1g-dev,
liblzma-dev,
- libbabeltrace-dev,
- libbabeltrace-ctf-dev,
+ libbabeltrace-dev [amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390x],
+ libbabeltrace-ctf-dev [amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390x],
+ python-dev,
+# Python3 build
python3-dev,
libkvm-dev [kfreebsd-any],
libunwind7-dev [ia64],
@@ -56,6 +59,22 @@ Description: GNU Debugger
Objective-C, Fortran, Java, OpenCL C, Pascal, assembly, Modula-2,
Go, and Ada. A must-have for any serious programmer.
+Package: gdb-python2 at TS@
+Architecture: any
+Depends: ${misc:Depends},
+ ${shlibs:Depends}
+Recommends: libc-dbg,
+ gdbserver [amd64 armel armhf arm64 i386 ia64 m32r m68k mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x x32]
+Suggests: gdb-doc
+Conflicts: gdb
+Replaces: gdb
+Description: 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,
+ Go, and Ada. A must-have for any serious programmer.
+
Package: gdb-minimal
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
diff --git a/debian/rules b/debian/rules
index 3a526c2..def2531 100755
--- a/debian/rules
+++ b/debian/rules
@@ -93,6 +93,7 @@ distribution := $(shell lsb_release -is)
deb_version := $(shell dpkg-parsechangelog | awk '/^Version:/ {print $$2}')
BUILDDIRMULTIARCH = $(ALL_BUILDDIR)/objdir-multiarch
+BUILDDIRPYTHON2 = $(ALL_BUILDDIR)/objdir-python2
run_tests := yes
@@ -108,6 +109,10 @@ ifeq ($(DEB_HOST_GNU_CPU),ia64)
arch_config_args := --with-libunwind-ia64
endif
+ifneq (,$(filter $(DEB_HOST_ARCH),amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390x))
+ arch_config_args += --with-babeltrace
+endif
+
ifdef GDB_TARGET
run_tests := no
@@ -129,19 +134,17 @@ EXTRA_FLAGS := --disable-gdbtk --disable-shared \
--srcdir=$(shell pwd) \
--disable-readline --with-system-readline --with-expat \
--without-zlib --without-lzma \
- --without-guile \
+ --without-guile --without-babeltrace \
$(arch_config_args) --build=$(DEB_BUILD_GNU_TYPE)
# Debian does not include 64-bit Python packages, so --with-python
# is here rather than in EXTRA_FLAGS.
DEB_CONFIGURE_EXTRA_FLAGS := --host=$(DEB_HOST_GNU_TYPE) $(EXTRA_FLAGS) \
- --enable-tui --with-python=python2 --without-babeltrace \
- --with-zlib --with-lzma
-# --with-babeltrace
+ --enable-tui --with-zlib --with-lzma --with-python=python3
# 64-bit flags
DEB_CONFIGURE_FLAGS_64 := --host=$(HOST64) $(EXTRA_FLAGS) \
- --enable-tui
+ --enable-tui --without-babeltrace
# multiarch targets; this is taken from the binutils-multiarch package but
# doesn't seem like a terribly nice list; see
@@ -163,6 +166,8 @@ MULTIARCH_TARGETS := \
mips64el-linux-gnu \
powerpc-linux-gnu \
powerpc-linux-gnuspe \
+ powerpc64le-linux-gnu \
+ powerpc64-linux-gnu \
ppc64-linux-gnu \
s390-linux-gnu \
s390x-linux-gnu \
@@ -187,6 +192,9 @@ DEB_CONFIGURE_FLAGS_MULTIARCH := $(DEB_CONFIGURE_EXTRA_FLAGS) \
DEB_CONFIGURE_FLAGS_MIN := --host=$(DEB_HOST_GNU_TYPE) $(EXTRA_FLAGS) \
--disable-tui --without-python --without-babeltrace
+DEB_CONFIGURE_FLAGS_PYTHON2 := $(DEB_CONFIGURE_EXTRA_FLAGS) \
+ --with-python=python2
+
# Support parallel=<n> in DEB_BUILD_OPTIONS (see #209008)
COMMA = ,
ifneq (,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS))))
@@ -204,6 +212,14 @@ build/gdb$(TS):: check-stamp
$(MAKE) -C $(DEB_BUILDDIR) info
$(MAKE) -C $(DEB_BUILDDIR)/gdb/doc refcard.dvi refcard.ps
+build/gdb-python2$(TS):: build-python2-stamp
+build-python2-stamp:
+ mkdir -p $(BUILDDIRPYTHON2)
+ cd $(BUILDDIRPYTHON2) && CFLAGS="$(CFLAGS)" \
+ $(shell pwd)/configure $(DEB_CONFIGURE_NORMAL_ARGS) $(DEB_CONFIGURE_DEBUG_ARGS) $(DEB_CONFIGURE_FLAGS_PYTHON2)
+ cd $(BUILDDIRPYTHON2) && $(DEB_MAKE_ENVVARS) $(MAKE) $(NJOBS)
+ touch $@
+
build/gdb64:: build64-stamp
build64-stamp:
mkdir -p $(BUILDDIR64)
@@ -264,6 +280,19 @@ ifeq ($(run_tests),yes)
debian/gdb$(TS)/usr/share/doc/gdb/check.log
endif
+binary-post-install/gdb-python2$(TS) ::
+ if [ -x debian/tmp/usr/bin/run ]; then \
+ mv debian/tmp/usr/bin/run \
+ debian/gdb-python2$(TS)/usr/bin/$(DEB_TARGET_ALIAS)-run; \
+ mv debian/tmp/usr/share/man/man1/run.1 \
+ debian/gdb-python2$(TS)/usr/share/man/man1/$(DEB_TARGET_ALIAS)-run.1; \
+ fi
+ifeq ($(run_tests),yes)
+ install -d debian/gdb-python2$(TS)/usr/share/doc/gdb
+ install -m 644 $(DEB_BUILDDIR)/gdb/testsuite/gdb.sum \
+ debian/gdb-python2$(TS)/usr/share/doc/gdb/check.log
+endif
+
ifneq ($(DEB_CROSS),yes)
# Only ship a global gdbinit for the native GDB.
install -d debian/gdb$(TS)/etc/gdb
@@ -322,6 +351,8 @@ ifeq ($(DEB_CROSS),yes)
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
+ sed "s+/gdb+/$(TP)gdb+g; s+usr/share/$(TP)gdb+usr/share/gdb-python2$(TS)+g" \
+ debian/gdb.install > debian/gdb-python2$(TS).install
endif
# The default changelog is the top level one, which is useless.
@@ -336,6 +367,15 @@ ifneq ($(DEB_CROSS),yes)
DEB_INSTALL_MANPAGES_gdb$(TS) = debian/gcore.1
endif
+DEB_INSTALL_DOCS_gdb-python2$(TS) = gdb/NEWS gdb/README gdb/doc/refcard.tex \
+ $(DEB_BUILDDIR)/gdb/doc/refcard.dvi \
+ $(DEB_BUILDDIR)/gdb/doc/refcard.ps \
+ gdb/contrib/
+DEB_INSTALL_CHANGELOGS_gdb-python2$(TS) = gdb/ChangeLog
+ifneq ($(DEB_CROSS),yes)
+DEB_INSTALL_MANPAGES_gdb-python2$(TS) = debian/gcore.1
+endif
+
DEB_INSTALL_DOCS_gdbserver = gdb/gdbserver/README
DEB_INSTALL_CHANGELOGS_gdbserver = gdb/gdbserver/ChangeLog
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gdb/gdb.git
More information about the Pkg-gdb-logs
mailing list