Package: zlib
Version: 1:1.2.3.4.dfsg-3
Severity: wishlist
Tags: patch
User: debian-s...@lists.debian.org
Usertags: s390x

Hi

zlib currently builds fine on s390x, but doesn't build any biarch
packages. They are need for example to build gcj, and they are still
going to be needed with multiarch, as it was agreed to keep the
toolchain built with multilib (iow biarch) for some more time.

Note that the option to build the 32-bit packages on s390x is -m31, due
to the limited address space to 31-bit in 32-bit mode, but it's better
to keep the name with 32 for consistency.

Would it be possible for you to add this patch in the next upload?
Thanks in advance.

Regards,
Aurelien


diff -Nru zlib-1.2.3.4.dfsg/debian/control zlib-1.2.3.4.dfsg/debian/control
--- zlib-1.2.3.4.dfsg/debian/control    2009-12-28 20:07:40.000000000 +0100
+++ zlib-1.2.3.4.dfsg/debian/control    2011-08-01 12:21:44.000000000 +0200
@@ -5,7 +5,7 @@
 Standards-Version: 3.8.3
 Homepage: http://zlib.net/
 XS-VCS-Bzr: http://bzr.debian.org/bzr/pkg-zlib/zlib/debian
-Build-Depends: debhelper (>= 6.0.7~), binutils (>= 2.18.1~cvs20080103-2) [mips 
mipsel], gcc-multilib [amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 
sparc]
+Build-Depends: debhelper (>= 6.0.7~), binutils (>= 2.18.1~cvs20080103-2) [mips 
mipsel], gcc-multilib [amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 
s390x sparc]
 
 Package: zlib1g
 Architecture: any
@@ -79,7 +79,7 @@
  files for building 64 bit applications.
 
 Package: lib32z1
-Architecture: amd64 ppc64 kfreebsd-amd64
+Architecture: amd64 ppc64 kfreebsd-amd64 s390x
 Conflicts: libc6-i386 (<= 2.9-18)
 Depends: ${shlibs:Depends}
 Replaces: ia32-libs (<< 1.5)
@@ -90,7 +90,7 @@
 
 Package: lib32z1-dev
 Section: libdevel
-Architecture: amd64 ppc64 kfreebsd-amd64
+Architecture: amd64 ppc64 kfreebsd-amd64 s390x
 Conflicts: libc6-i386 (<= 2.9-18)
 Depends: lib32z1 (= ${binary:Version}), zlib1g-dev (= ${binary:Version}), 
lib32c-dev
 Provides: lib32z-dev
diff -Nru zlib-1.2.3.4.dfsg/debian/rules zlib-1.2.3.4.dfsg/debian/rules
--- zlib-1.2.3.4.dfsg/debian/rules      2009-12-28 20:07:40.000000000 +0100
+++ zlib-1.2.3.4.dfsg/debian/rules      2011-08-01 12:26:45.000000000 +0200
@@ -44,12 +44,17 @@
 endif
 endif
 
-32-ARCHS=amd64 ppc64 kfreebsd-amd64
+32-ARCHS=amd64 ppc64 kfreebsd-amd64 s390x
 ifneq (,$(findstring $(DEB_HOST_ARCH), $(32-ARCHS)))
 EXTRA_INSTALL=install32
 EXTRA_BUILD=build32-stamp
+# s390x doesn't use -m32
+ifneq (,$(findstring $(DEB_HOST_ARCH), s390x))
+m32=-m31
+else
 m32=-m32
 endif
+endif
 
 N32-ARCHS=mips mipsel
 ifneq (,$(findstring $(DEB_HOST_ARCH), $(N32-ARCHS)))


-- System Information:
Debian Release: wheezy/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.39-2-amd64 (SMP w/4 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