control: tag -1 + patch
Hi,
On 2025-01-07 20:33, Lucas Nussbaum wrote:
> Source: cross-toolchain-base-ports
> Version: 70
> Severity: serious
> Justification: FTBFS
> Tags: trixie sid ftbfs
> User: lu...@debian.org
> Usertags: ftbfs-20250106 ftbfs-trixie
>
> Hi,
>
> During a rebuild of all packages in sid, your package failed to build
> on amd64.
>
>
> Relevant part (hopefully):
> > debian/rules build
> > linux: 6.12.8-1 / 6.12.6-1cross1
> > glibc: 2.40-5 / 2.40-4cross1
> >
> > old linux version: 6.12.6-1 / 1
> > old glibc version: 2.40-4 / 1
> >
> > new linux version: 6.12.8-1cross1
> > new glibc version: 2.40-5cross1
> > START stamp-dir/init-glibc
> > rm -rf glibc-2.40
> > tar -x -f /usr/src/glibc/glibc-2.40.tar.xz
> > cp -a /usr/src/glibc/debian/ glibc-2.40
> > cd glibc-2.40 ; \
> > QUILT_PATCHES=/<<PKGBUILDDIR>>/debian/patches/glibc/debian quilt --quiltrc
> > /dev/null push -a && \
> > rm -rf .pc/
> > Applying patch dpkg-shlibs.patch
> > patching file debian/rules.d/debhelper.mk
> > Hunk #1 FAILED at 82.
> > 1 out of 1 hunk FAILED -- rejects in file debian/rules.d/debhelper.mk
> > Patch dpkg-shlibs.patch does not apply (enforce with -f)
> > make: *** [debian/rules:446: stamp-dir/init-glibc] Error 1
Please find attached a patch to fix this bug.
Regards
Aurelien
--
Aurelien Jarno GPG: 4096R/1DDD8C9B
aurel...@aurel32.net http://aurel32.net
--- cross-toolchain-base-ports-70/debian/changelog
+++ cross-toolchain-base-ports-70+nmu1/debian/changelog
@@ -1,3 +1,13 @@
+cross-toolchain-base-ports (70+nmu1) unstable; urgency=medium
+
+ * Build using linux 6.12.17.
+ * Build using gcc 14.2.0-17.
+ * Build using glibc 2.41-4.
+ * Build using binutils 2.44-3.
+ * Refresh glibc patches. Closes: #1092397.
+
+ -- Aurelien Jarno <aure...@debian.org> Sun, 09 Mar 2025 15:03:00 +0100
+
cross-toolchain-base-ports (70) unstable; urgency=medium
* Build using linux 6.12.6.
--- cross-toolchain-base-ports-70/debian/control
+++ cross-toolchain-base-ports-70+nmu1/debian/control
@@ -8,10 +8,10 @@
Standards-Version: 4.7.0
Build-Depends: binutils-multiarch,
dpkg (>= 1.21.17), rdfind, symlinks, lsb-release,
- binutils-source (>= 2.43.50.20241230-1~),
- glibc-source (>= 2.40-4~),
- gcc-14-source (>= 14.2.0-12~), g++-14 (>= 14.2.0-12~),
- linux-source-6.12 (>= 6.12.6-1~), linux-libc-dev (>= 6.12.6-1~),
+ binutils-source (>= 2.44-3~),
+ glibc-source (>= 2.41-4~),
+ gcc-14-source (>= 14.2.0-17~), g++-14 (>= 14.2.0-17~),
+ linux-source-6.12 (>= 6.12.17-1~), linux-libc-dev (>= 6.12.17-1~),
autoconf (>= 2.69), autoconf2.69,
automake, bison (>= 1:2.3), chrpath, debhelper-compat (= 13),
dpkg-dev (>= 1.15.3.1), fakeroot, file, flex,
--- cross-toolchain-base-ports-70/debian/patches/glibc/debian/dpkg-shlibs.patch
+++
cross-toolchain-base-ports-70+nmu1/debian/patches/glibc/debian/dpkg-shlibs.patch
@@ -4,12 +4,12 @@
--- a/debian/rules.d/debhelper.mk
+++ b/debian/rules.d/debhelper.mk
-@@ -82,7 +82,7 @@ endif
+@@ -73,7 +73,7 @@ endif
sh ./debian/shlibs-add-udebs $(curpass)
dh_installdeb -p$(curpass)
-- dh_shlibdeps -p$(curpass)
-+ #dh_shlibdeps -p$(curpass)
+- dh_shlibdeps -p$(curpass) $(foreach path,$($(lastword $(subst -,
,$(curpass)))_slibdir),-l/usr$(path))
++# dh_shlibdeps -p$(curpass) $(foreach path,$($(lastword $(subst -,
,$(curpass)))_slibdir),-l/usr$(path))
dh_gencontrol -p$(curpass)
dh_md5sums -p$(curpass)
--- cross-toolchain-base-ports-70/debian/rules
+++ cross-toolchain-base-ports-70+nmu1/debian/rules
@@ -74,10 +74,10 @@
export ELF_PACKAGE_METADATA
endif
-MIN_VER_GLIBC := 2.40-4~
-MIN_VER_LINUX := 6.12.6-1~
-MIN_VER_GCC := 14.2.0-12~
-MIN_VER_BINUTILS := 2.43.50.20241230-1~
+MIN_VER_GLIBC := 2.41-4~
+MIN_VER_LINUX := 6.12.17-1~
+MIN_VER_GCC := 14.2.0-17~
+MIN_VER_BINUTILS := 2.44-3~
VER_GCC_BASE := 14
libgcc_base := gcc-s
