Package: python2.6
Version: 2.6.7-3
Severity: important
Tags: patch
Justification: fails to build from source
User: debian-s...@lists.debian.org
Usertags: s390x

python2.6 fails to build on s390x due to symbol changes: Py_InitModule4
is not present while Py_InitModule4_64 is present.

There is a code snipped in the debian/rules file to handle 64-bit
architectures, but it uses an explicit list of architectures. The patch
below changes that using DEB_HOST_ARCH_BITS so that it will also work on
future 64-bit architectures.

diff -u python2.6-2.6.7/debian/rules python2.6-2.6.7/debian/rules
--- python2.6-2.6.7/debian/rules
+++ python2.6-2.6.7/debian/rules
@@ -9,6 +9,7 @@
 #export DH_VERBOSE=1
 
 DEB_HOST_ARCH          ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_ARCH_BITS     ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_BITS)
 DEB_HOST_ARCH_OS       ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 
 changelog_values := $(shell dpkg-parsechangelog \
@@ -553,7 +554,7 @@
                  <$$f >$$f2; \
          fi; \
        done
-ifneq (,$(filter $(DEB_HOST_ARCH), alpha amd64 ia64 ppc64 sparc64 
kfreebsd-amd64))
+ifeq ($(DEB_HOST_ARCH_BITS), 64)
        sed -i 's/\(Py_InitModule4[^@]*\)@/\1_64@/' \
                debian/lib$(PVER).symbols debian/$(PVER)-dbg.symbols
 endif


-- System Information:
Debian Release: wheezy/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: s390x

Kernel: Linux 2.6.32-5-s390x (SMP w/3 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Reply via email to