Path: csiph.com!fu-berlin.de!bofh.it!news.nic.it!robomod From: Helmut Grohne Newsgroups: linux.debian.bugs.rc Subject: Bug#1064003: patch for c-t-b build Date: Sun, 05 May 2024 21:10:02 +0200 Message-ID: References: X-Mailbox-Line: From debian-bugs-rc-request@lists.debian.org Sun May 5 19:00:16 2024 Old-Return-Path: X-Spam-Flag: NO X-Spam-Score: 0.249 Reply-To: Helmut Grohne , 1064003@bugs.debian.org Resent-To: debian-bugs-dist@lists.debian.org Resent-Cc: Cross Toolchain Base Team X-Debian-Pr-Message: followup 1064003 X-Debian-Pr-Package: src:cross-toolchain-base X-Debian-Pr-Keywords: sid trixie X-Debian-Pr-Source: cross-toolchain-base MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="dlQc6ejhlaWpHdC7" Content-Disposition: inline X-Debian-Message: from BTS X-Mailing-List: archive/latest/742231 List-ID: List-URL: Approved: robomod@news.nic.it Lines: 88 Organization: linux.* mail to news gateway Sender: robomod@news.nic.it X-Original-Date: Sun, 5 May 2024 20:57:01 +0200 X-Original-Message-ID: <20240505185701.GA2389837@subdivi.de> X-Original-References: <98a9d24f-c78c-424b-95a4-b6b1fa906b2e@debian.org> Xref: csiph.com linux.debian.bugs.rc:363086 --dlQc6ejhlaWpHdC7 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Control: tags -1 + patch Hi Matthias, I'm attaching a patch for the c-t-b FTBFS. Note that due to the glibc/2.38 upload c-t-b has become completely uninstallable. Hence, a timely upload is appreciated. Due to linux-libc-dev currently providing the -$arch-cross packages, we have to remove the Build-Conflicts or make rename the Provides on linux-libc-dev. I'm ok with both approaches and offer dropping the conflict here. Helmut --dlQc6ejhlaWpHdC7 Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="cross-toolchain-base_68+nmu1.debdiff" diff --minimal -Nru cross-toolchain-base-68/debian/changelog cross-toolchain-base-68+nmu1/debian/changelog --- cross-toolchain-base-68/debian/changelog 2023-10-31 09:50:26.000000000 +0100 +++ cross-toolchain-base-68+nmu1/debian/changelog 2024-05-04 09:23:39.000000000 +0200 @@ -1,3 +1,12 @@ +cross-toolchain-base (68+nmu1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Build using linux 6.7. Closes: #1064003, #1067370. + * Build using glibc 2.38. + * Remove linux-libc-dev-ARCH-cross from GLIBC_BUILD_CONFLICTS. + + -- Helmut Grohne Sat, 04 May 2024 09:23:39 +0200 + cross-toolchain-base (68) unstable; urgency=medium * Build using linux 6.5.8. Closes: #1042118. diff --minimal -Nru cross-toolchain-base-68/debian/control cross-toolchain-base-68+nmu1/debian/control --- cross-toolchain-base-68/debian/control 2023-10-31 09:50:26.000000000 +0100 +++ cross-toolchain-base-68+nmu1/debian/control 2024-05-04 09:23:39.000000000 +0200 @@ -9,9 +9,9 @@ Build-Depends: binutils-multiarch, dpkg (>= 1.21.17), rdfind, symlinks, lsb-release, binutils-source (>= 2.41-6~), - glibc-source (>= 2.37-3~), + glibc-source (>= 2.38), gcc-12-source (>= 12.3.0-11~), g++-12 (>= 12.3.0-11~), - linux-source-6.5 (>= 6.5.8), linux-libc-dev (>= 6.5.8), + linux-source-6.7 (>= 6.7.0), linux-libc-dev (>= 6.7.0), autoconf (>= 2.69), autoconf2.69, autogen, automake, bison (>= 1:2.3), chrpath, debhelper-compat (= 13), dpkg-dev (>= 1.15.3.1), fakeroot, file, flex, @@ -27,7 +27,7 @@ libjansson-dev, pkg-config, Build-Conflicts: dpkg-cross, libdebian-dpkgcross-perl, binutils-x86-64-linux-gnu [!amd64], binutils-i686-linux-gnu [!i386], binutils-s390x-linux-gnu [!s390x], binutils-powerpc64le-linux-gnu [!ppc64el], binutils-aarch64-linux-gnu [!arm64], binutils-arm-linux-gnueabihf [!armhf], binutils-arm-linux-gnueabi [!armel], binutils-riscv64-linux-gnu [!riscv64], - libc6-amd64-cross, linux-libc-dev-amd64-cross, libc6-i386-cross, linux-libc-dev-i386-cross, libc6-s390x-cross, linux-libc-dev-s390x-cross, libc6-ppc64el-cross, linux-libc-dev-ppc64el-cross, libc6-arm64-cross, linux-libc-dev-arm64-cross, libc6-armhf-cross, linux-libc-dev-armhf-cross, libc6-armel-cross, linux-libc-dev-armel-cross, libc6-riscv64-cross, linux-libc-dev-riscv64-cross, + libc6-amd64-cross, libc6-i386-cross, libc6-s390x-cross, libc6-ppc64el-cross, libc6-arm64-cross, libc6-armhf-cross, libc6-armel-cross, libc6-riscv64-cross, libc6-amd64 [i386 x32], libc6-i386 [amd64 x32], libc6-x32 [amd64 i386] Package: linux-libc-dev-amd64-cross diff --minimal -Nru cross-toolchain-base-68/debian/rules cross-toolchain-base-68+nmu1/debian/rules --- cross-toolchain-base-68/debian/rules 2023-10-31 09:50:26.000000000 +0100 +++ cross-toolchain-base-68+nmu1/debian/rules 2024-05-04 09:23:39.000000000 +0200 @@ -61,8 +61,8 @@ CROSS_GNU_TYPE = $(call _gnu_type,${CROSS_ARCH}) CROSS_PKG_GNU_TYPE = $(subst _,-,$(call _gnu_type,${CROSS_ARCH})) -MIN_VER_GLIBC := 2.37-3~ -MIN_VER_LINUX := 6.5.8 +MIN_VER_GLIBC := 2.38 +MIN_VER_LINUX := 6.7.0 MIN_VER_GCC := 12.3.0-11~ MIN_VER_BINUTILS := 2.41-6~ VER_GCC_BASE := 12 @@ -110,7 +110,7 @@ # FIXME: No conflict for the host == cross case ... BINUTILS_BUILD_CONFLICTS = $(foreach a,$(CROSS_ARCHS),binutils-$(subst _,-,$(call _gnu_type,$(a))) [!$(a)]$(,)) -GLIBC_BUILD_CONFLICTS = $(foreach a,$(CROSS_ARCHS),libc6-$(a)-cross$(,) linux-libc-dev-$(a)-cross$(,)) +GLIBC_BUILD_CONFLICTS = $(foreach a,$(CROSS_ARCHS),libc6-$(a)-cross$(,)) # taken from gcc packaging define unpack_tarball --dlQc6ejhlaWpHdC7--