Bug#1125669: zlib: build-depends on gcc-multilib [s390x], which will get removed (needs coordination)
Aurelien Jarno <[email protected]>
| Newsgroups | gmane.linux.debian.ports.s390 |
|---|---|
| Message-ID | <176850028630.460953.13123731242237836378.reportbug__33935.0140698784$1768500455$gmane$org@ohm.local> |
Source: zlib Version: 1:1.3.dfsg+really1.3.1-1 Severity: wishlist Tags: patch X-Debbugs-Cc: [email protected] User: [email protected] Usertags: s390x 31-bit-removal Dear maintainer(s), Linux 6.19 will drop support for 31-bit compatibility on s390x, and will also stop providing 31-bit support in UAPI header files [1]. Once this lands in unstable, it will become impossible to build the libc6-s390 and libc6-dev-s390 packages on s390x, and in turns the gcc-multilib and g++-multilib packages. zlib build-depends on gcc-multilib [s390x], this will have to be fixed by disabling the build of lib32z1 and lib32z1-dev on s390x. That said this cannot be done yet (hence the severity wishlist), as zlib in a circular loop with gcc-defaults, gcc-15, and some coordination will be needed to upload all these packages within a few days. Please find attached a patch I tested for this removal. Please get ready to integrate it, but please also WAIT for the coordination for the final step before uploading such a change to unstable. On the other hand, upload to experimental is fine. Regards Aurelien [1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=3db5cf9354710c3b9268af74a0dca88514279453
zlib-s390x-31-bit-removal.debdiff
(text/plain, 2.2 KB)
--- zlib-1.3.dfsg+really1.3.1/debian/control +++ zlib-1.3.dfsg+really1.3.1/debian/control @@ -4,7 +4,7 @@ Maintainer: Mark Brown <[email protected]> Standards-Version: 4.6.1 Homepage: http://zlib.net/ -Build-Depends: dpkg-dev (>= 1.22.5), debhelper (>= 13), gcc-multilib [amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 sparc s390x mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64 mips64el mips64r6 mips64r6el x32] <!nobiarch>, dpkg-dev (>= 1.16.1), autoconf +Build-Depends: dpkg-dev (>= 1.22.5), debhelper (>= 13), gcc-multilib [amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 sparc mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64 mips64el mips64r6 mips64r6el x32] <!nobiarch>, dpkg-dev (>= 1.16.1), autoconf Package: zlib1g Architecture: any @@ -68,7 +68,7 @@ runtime. Package: lib32z1 -Architecture: amd64 ppc64 kfreebsd-amd64 s390x +Architecture: amd64 ppc64 kfreebsd-amd64 Build-Profiles: <!nobiarch> Conflicts: libc6-i386 (<= 2.9-18) Depends: ${shlibs:Depends}, ${misc:Depends} @@ -80,7 +80,7 @@ Package: lib32z1-dev Section: libdevel -Architecture: amd64 ppc64 kfreebsd-amd64 s390x +Architecture: amd64 ppc64 kfreebsd-amd64 Build-Profiles: <!nobiarch> Conflicts: libc6-i386 (<= 2.9-18) Depends: lib32z1 (= ${binary:Version}), zlib1g-dev (= ${binary:Version}), lib32c-dev, ${misc:Depends} --- zlib-1.3.dfsg+really1.3.1/debian/rules +++ zlib-1.3.dfsg+really1.3.1/debian/rules @@ -36,22 +36,14 @@ ifeq (,$(filter nobiarch,$(DEB_BUILD_PROFILES))) -32-ARCHS=amd64 ppc64 kfreebsd-amd64 s390x +32-ARCHS=amd64 ppc64 kfreebsd-amd64 64-ARCHS=s390 sparc i386 powerpc mips mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el x32 ifneq (,$(filter $(DEB_HOST_ARCH), $(32-ARCHS))) EXTRA_INSTALL=install32 EXTRA_BUILD=build32-stamp -# s390x fails at compatibility. -ifneq (,$(filter $(DEB_HOST_ARCH), s390x)) -m32=-m31 -else -m32=-m32 -endif endif -ifneq (,$(filter s390x, $(DEB_HOST_ARCH))) -else ifneq (,$(filter $(DEB_HOST_ARCH), $(64-ARCHS))) EXTRA_INSTALL=install64 EXTRA_BUILD=build64-stamp @@ -62,7 +54,6 @@ m64=-m64 endif endif -endif N32-ARCHS=mips mipsel ifneq (,$(filter $(DEB_HOST_ARCH), $(N32-ARCHS)))