cross-toolchain-base-devs team mailing list archive

[Aurelien Jarno <aurel32@xxxxxxxxxx>]

control: tag -1 + patch

On 2025-03-17 19:06, Aurelien Jarno wrote:
> control: reassign -1 cross-toolchain-base-mipsen
>
> On 2025-03-17 02:55, Matthias Klose wrote:
> > Control: reopen -1
> >
> > reopening, c-t-b-mipsen is still unfixed. I'm fine to drop the 
> > intermediate patch in c-t-b and c-t-b-ports.
>
> c-t-b-mipsen needs an upload anyway. Given the toolchain is frozen 
> already, let's apply the same strategy that you have chosen for c-t-b 
> and c-t-b-ports. I am therefore reassigning the bug.

Please find attached a patch to fix the issue, fix the conflicts in 
dpkg-shlibs.patch and update to the latest toolchain versions.

Regards
Aurelien

--
Aurelien Jarno                          GPG: 4096R/1DDD8C9B
aurelien@xxxxxxxxxxx                     http://aurel32.net

diff -Nru cross-toolchain-base-mipsen-32/debian/changelog cross-toolchain-base-mipsen-32+nmu1/debian/changelog
--- cross-toolchain-base-mipsen-32/debian/changelog	2025-01-08 23:57:40.000000000 +0100
+++ cross-toolchain-base-mipsen-32+nmu1/debian/changelog	2025-03-17 21:43:04.000000000 +0100
@@ -1,3 +1,16 @@
+cross-toolchain-base-mipsen (32+nmu1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Build using linux 6.12.19.
+  * Build using gcc 14.2.0-19.
+  * Build using glibc 2.41-6.
+  * Build using binutils 2.44-3.
+  * Refresh glibc patches.
+  * Don't let the libc*-dev*-cross multilib packages conflict with each other.
+    Closes: #1100544.
+
+ -- Aurelien Jarno <aurel32@xxxxxxxxxx>  Mon, 17 Mar 2025 21:43:04 +0100
+
 cross-toolchain-base-mipsen (32) unstable; urgency=medium
 
   * Disable dpkg-shlibs.patch.
diff -Nru cross-toolchain-base-mipsen-32/debian/control cross-toolchain-base-mipsen-32+nmu1/debian/control
--- cross-toolchain-base-mipsen-32/debian/control	2025-01-05 04:11:14.000000000 +0100
+++ cross-toolchain-base-mipsen-32+nmu1/debian/control	2025-03-17 21:43:04.000000000 +0100
@@ -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-6~),
+  gcc-14-source (>= 14.2.0-19~), g++-14 (>= 14.2.0-19~),
+  linux-source-6.12 (>= 6.12.19-1~), linux-libc-dev (>= 6.12.19-1~),
   autoconf (>= 2.69), autoconf2.69,
   automake, bison (>= 1:2.3), chrpath, debhelper-compat (= 13),
   dpkg-dev (>= 1.15.3.1), fakeroot, file, flex,
diff -Nru cross-toolchain-base-mipsen-32/debian/patches/glibc/debian/dpkg-shlibs.patch cross-toolchain-base-mipsen-32+nmu1/debian/patches/glibc/debian/dpkg-shlibs.patch
--- cross-toolchain-base-mipsen-32/debian/patches/glibc/debian/dpkg-shlibs.patch	2025-01-05 04:04:59.000000000 +0100
+++ cross-toolchain-base-mipsen-32+nmu1/debian/patches/glibc/debian/dpkg-shlibs.patch	2025-03-17 21:43:04.000000000 +0100
@@ -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)
  
diff -Nru cross-toolchain-base-mipsen-32/debian/rules cross-toolchain-base-mipsen-32+nmu1/debian/rules
--- cross-toolchain-base-mipsen-32/debian/rules	2025-01-05 04:23:41.000000000 +0100
+++ cross-toolchain-base-mipsen-32+nmu1/debian/rules	2025-03-17 21:43:04.000000000 +0100
@@ -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-6~
+MIN_VER_LINUX		:= 6.12.19-1~
+MIN_VER_GCC		:= 14.2.0-19~
+MIN_VER_BINUTILS	:= 2.44-3~
 VER_GCC_BASE		:= 14
 libgcc_base		:= gcc-s
 
@@ -946,8 +946,7 @@
 	      || echo 'Multi-Arch: foreign' >> $$tmp/DEBIAN/control; \
 	esac; \
 	case "$$pkgname" in \
-	  libc*-dev*-cross) ;; \
-	  libc*-cross) \
+	  libc*-cross | libc*-dev*-cross) \
 	    sed -i -E '/^Conflicts:/s/ libc[^,]*(,|$$)//g;/^Conflicts: *$$/d' $$tmp/DEBIAN/control; \
 	esac; \
 	newdeb=`echo $$deb|sed -e "s/\(.*\)_\(.*\)_\(.*\)/\1_\2$(CROSS_EXT)_\3/g"`; \