[Pkg-gdb-logs] [gdb] 01/02: Remove now unused multilib Build-Depends and code

[Hector Oron]

This is an automated email from the git hooks/post-receive script.

zumbi pushed a commit to branch master
in repository gdb.

commit c48d81fd9001a31cdd679f25de3aa2117a42f32b
Author: Guillem Jover <guillem at debian.org>
Date:   Sat Jan 24 18:30:26 2015 +0100

    Remove now unused multilib Build-Depends and code
---
 debian/control    |  7 +++----
 debian/control.in |  7 +++----
 debian/rules      | 25 +------------------------
 3 files changed, 7 insertions(+), 32 deletions(-)

diff --git a/debian/control b/debian/control
index c012d9c..28568f2 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,6 @@ Build-Depends:
                dejagnu,
                flex | flex-old,
                procps,
-               g++-multilib [i386 powerpc s390 sparc],
 # Do we really care that much about running the Java tests?
 #               gcj-jdk | gcj,
                gobjc,
@@ -27,9 +26,9 @@ Build-Depends:
                texinfo (>= 4.7-2.2),
                texlive-base,
 # Libdev deps
-               libexpat1-dev, lib64expat1-dev [i386 powerpc s390 sparc],
-               libncurses5-dev, lib64ncurses5-dev [i386 powerpc s390 sparc],
-               libreadline-dev, lib64readline6-dev [i386 powerpc s390 sparc],
+               libexpat1-dev,
+               libncurses5-dev,
+               libreadline-dev,
                zlib1g-dev,
                liblzma-dev,
                libbabeltrace-dev [amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390x],
diff --git a/debian/control.in b/debian/control.in
index 8a1e07c..7ad0033 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -18,7 +18,6 @@ Build-Depends:
                dejagnu,
                flex | flex-old,
                procps,
-               g++-multilib [i386 powerpc s390 sparc],
 # Do we really care that much about running the Java tests?
 #               gcj-jdk | gcj,
                gobjc,
@@ -27,9 +26,9 @@ Build-Depends:
                texinfo (>= 4.7-2.2),
                texlive-base,
 # Libdev deps
-               libexpat1-dev, lib64expat1-dev [i386 powerpc s390 sparc],
-               libncurses5-dev, lib64ncurses5-dev [i386 powerpc s390 sparc],
-               libreadline-dev, lib64readline6-dev [i386 powerpc s390 sparc],
+               libexpat1-dev,
+               libncurses5-dev,
+               libreadline-dev,
                zlib1g-dev,
                liblzma-dev,
                libbabeltrace-dev [amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390x],
diff --git a/debian/rules b/debian/rules
index d1a5e62..8732563 100755
--- a/debian/rules
+++ b/debian/rules
@@ -66,25 +66,6 @@ ifdef GDB_TARGET
   TP = $(DEB_TARGET_ALIAS)-
   TS = -$(DEB_TARGET_ALIAS)
   CROSS_FORCE = FORCE
-else
-ifneq (,$(filter $(DEB_HOST_ARCH),i386 powerpc sparc s390))
-  build64 = yes
-  CC64 = gcc -m64
-  CFLAGS64 = $(CFLAGS)
-  BUILDDIR64 = $(ALL_BUILDDIR)/objdir64
-  ifeq ($(DEB_HOST_ARCH),i386)
-    HOST64 = x86_64-linux-gnu
-  endif
-  ifeq ($(DEB_HOST_ARCH),powerpc)
-    HOST64 = powerpc64-linux-gnu
-  endif
-  ifeq ($(DEB_HOST_ARCH),sparc)
-    HOST64 = sparc64-linux-gnu
-  endif
-  ifeq ($(DEB_HOST_ARCH),s390)
-    HOST64 = s390x-linux-gnu
-  endif
-endif
 endif
 
 distribution := $(shell lsb_release -is)
@@ -140,10 +121,6 @@ EXTRA_FLAGS := --disable-gdbtk --disable-shared \
 DEB_CONFIGURE_EXTRA_FLAGS := --host=$(DEB_HOST_GNU_TYPE) $(EXTRA_FLAGS) \
 	--enable-tui --with-zlib --with-lzma --with-python=python3
 
-# 64-bit flags
-DEB_CONFIGURE_FLAGS_64 := --host=$(HOST64) $(EXTRA_FLAGS) \
-	--enable-tui --without-babeltrace
-
 # 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
@@ -242,7 +219,7 @@ endif
 	touch $@
 
 clean::
-	rm -f check-stamp build64-stamp build-multiarch-stamp
+	rm -f check-stamp build-multiarch-stamp
 	rm -rf $(ALL_BUILDDIR)
 
 	if test -f gdb/version.in.backup; then \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gdb/gdb.git