Control: tags -1 + pending Hi Mark,
I am NMUing zlib to include these two longstanding portability patches. Both of them are needed for architecture cross bootstrap. You'll find the full diff attached. Please let me know if I should delay this any further. Helmut
diff -Nru zlib-1.3.dfsg+really1.3.1/debian/changelog zlib-1.3.dfsg+really1.3.1/debian/changelog --- zlib-1.3.dfsg+really1.3.1/debian/changelog 2024-05-10 11:32:36.000000000 +0200 +++ zlib-1.3.dfsg+really1.3.1/debian/changelog 2026-01-13 09:27:23.000000000 +0100 @@ -1,3 +1,14 @@ +zlib (1:1.3.dfsg+really1.3.1-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix FTCBFS: (closes: #1050995) + + Let dh_auto_configure pass --host to minizip. + + cross.patch: Link miniunzip with -lz. + * Use dpkg's makefiles to clean up code. + * Support the noudeb build profile (closes: #1024936). + + -- Helmut Grohne <[email protected]> Tue, 13 Jan 2026 09:27:23 +0100 + zlib (1:1.3.dfsg+really1.3.1-1) unstable; urgency=low * New upstream release. diff -Nru zlib-1.3.dfsg+really1.3.1/debian/control zlib-1.3.dfsg+really1.3.1/debian/control --- zlib-1.3.dfsg+really1.3.1/debian/control 2024-05-10 11:32:36.000000000 +0200 +++ zlib-1.3.dfsg+really1.3.1/debian/control 2026-01-13 09:27:23.000000000 +0100 @@ -33,6 +33,7 @@ Package: zlib1g-udeb XC-Package-Type: udeb +Build-Profiles: <!noudeb> Architecture: any Priority: optional Section: debian-installer diff -Nru zlib-1.3.dfsg+really1.3.1/debian/patches/cross.patch zlib-1.3.dfsg+really1.3.1/debian/patches/cross.patch --- zlib-1.3.dfsg+really1.3.1/debian/patches/cross.patch 1970-01-01 01:00:00.000000000 +0100 +++ zlib-1.3.dfsg+really1.3.1/debian/patches/cross.patch 2026-01-13 09:27:23.000000000 +0100 @@ -0,0 +1,18 @@ +From: Helmut Grohne <[email protected]> +Subject: link miniunzip with -lz + +We pass -L../.. to the build in order to find the local libz.so.1, but -L only +affects -l and not libraries required from other libraries. We therefore have +to pass -lz explicitly here. + +--- zlib-1.2.13.dfsg.orig/contrib/minizip/Makefile.am ++++ zlib-1.2.13.dfsg/contrib/minizip/Makefile.am +@@ -39,7 +39,7 @@ + EXTRA_PROGRAMS = miniunzip minizip + + miniunzip_SOURCES = miniunz.c +-miniunzip_LDADD = libminizip.la ++miniunzip_LDADD = libminizip.la -lz + + minizip_SOURCES = minizip.c + minizip_LDADD = libminizip.la -lz diff -Nru zlib-1.3.dfsg+really1.3.1/debian/patches/series zlib-1.3.dfsg+really1.3.1/debian/patches/series --- zlib-1.3.dfsg+really1.3.1/debian/patches/series 2024-05-10 11:32:36.000000000 +0200 +++ zlib-1.3.dfsg+really1.3.1/debian/patches/series 2026-01-13 09:27:23.000000000 +0100 @@ -0,0 +1 @@ +cross.patch diff -Nru zlib-1.3.dfsg+really1.3.1/debian/rules zlib-1.3.dfsg+really1.3.1/debian/rules --- zlib-1.3.dfsg+really1.3.1/debian/rules 2024-05-10 11:32:36.000000000 +0200 +++ zlib-1.3.dfsg+really1.3.1/debian/rules 2026-01-13 09:27:23.000000000 +0100 @@ -9,24 +9,16 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -# These are used for cross-compiling and for saving the configure script -# from having to guess our platform (since we know it already) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) -DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_GNU_OS) -DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) - -CFLAGS = `dpkg-buildflags --get CFLAGS` `dpkg-buildflags --get CPPFLAGS` -Wall -D_REENTRANT -LDFLAGS = `dpkg-buildflags --get LDFLAGS` - -# binutils doesn't supply the prefixed version normally like GCC does so -# we can't just unconditionally use DEB_HOST_GNU_TYPE-ar -ifeq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE)) - AR=ar -else - AR=$(DEB_HOST_GNU_TYPE)-ar -endif +include /usr/share/dpkg/architecture.mk + +DEB_CFLAGS_MAINT_APPEND = -Wall -D_REENTRANT +include /usr/share/dpkg/buildflags.mk +CFLAGS += $(CPPFLAGS) +export CFLAGS LDFLAGS +export uname=GNU + +include /usr/share/dpkg/buildtools.mk +export AR ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 @@ -85,9 +77,10 @@ if [ ! -f Makefile.stash ]; then cp Makefile Makefile.stash ; fi - AR=$(AR) CC="$(DEB_HOST_GNU_TYPE)-gcc" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" uname=GNU ./configure --shared --prefix=/usr --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) + CC="$(CC)" ./configure --shared --prefix=/usr --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) - cd contrib/minizip && autoreconf -fis && CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" uname=GNU ./configure --prefix=/usr --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) + cd contrib/minizip && autoreconf -fis + dh_auto_configure --sourcedirectory=contrib/minizip touch $@ @@ -96,9 +89,8 @@ mkdir -p debian/64 cp -r $(COPYLIST) debian/64 - cd debian/64 && AR=$(AR) CC="$(DEB_HOST_GNU_TYPE)-gcc $(m64)" \ - CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \ - uname=GNU ./configure --shared --prefix=/usr --libdir=\$${prefix}/usr/lib64 + cd debian/64 && CC="$(CC) $(m64)" \ + ./configure --shared --prefix=/usr --libdir=\$${prefix}/usr/lib64 touch $@ configure32-stamp: configure @@ -106,9 +98,8 @@ mkdir -p debian/32 cp -r $(COPYLIST) debian/32 - cd debian/32 && AR=$(AR) CC="$(DEB_HOST_GNU_TYPE)-gcc $(m32)" \ - CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \ - uname=GNU ./configure --shared --prefix=/usr --libdir=\$${prefix}/usr/lib32 + cd debian/32 && CC="$(CC) $(m32)" \ + ./configure --shared --prefix=/usr --libdir=\$${prefix}/usr/lib32 touch $@ configuren32-stamp: configure @@ -116,9 +107,8 @@ mkdir -p debian/n32 cp -r $(COPYLIST) debian/n32 - cd debian/n32 && AR=$(AR) CC="$(DEB_HOST_GNU_TYPE)-gcc $(mn32)" \ - CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \ - uname=GNU ./configure --shared --prefix=/usr --libdir=\$${prefix}/usr/lib32 + cd debian/n32 && CC="$(CC) $(mn32)" \ + ./configure --shared --prefix=/usr --libdir=\$${prefix}/usr/lib32 touch $@ build: build-arch build-indep
