Bug#1037757: llvm-toolchain-13: ftbfs with GCC-13

[Stéphane Glondu]

Hi,

Le 29/07/2023 à 08:57, Stéphane Glondu a écrit :
Therefore, I am going to submit a NMU forcing usage of g++-12.

It FTBFS with an error about missing asm/errno.h (among others).

Exporting CPATH=/usr/include/x86_64-linux-gnu, the build goes a bit 
further, but fails at linking libomp.so.5.

I attach the (non-working) patch for reference.

I don't know how to make progress on this matter at the moment.


Cheers,

--
StéphaneFrom 01afffd4666c7b0d3a890d6104d7d4a8f60f8f8e Mon Sep 17 00:00:00 2001
From: Stephane Glondu <Stéphane Glondu glo...@debian.org>
Date: Sat, 29 Jul 2023 08:00:21 +0200
Subject: [PATCH] Use g++-12 (Closes: #1037757)

---
 debian/changelog | 7 +++++++
 debian/control   | 3 ++-
 debian/rules     | 4 +---
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index edce89dcf..1e1215a17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+llvm-toolchain-13 (1:13.0.1-11.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Use g++-12 (Closes: #1037757)
+
+ -- Stéphane Glondu <glo...@debian.org>  Sat, 29 Jul 2023 09:39:11 +0200
+
 llvm-toolchain-13 (1:13.0.1-11) unstable; urgency=medium
 
   * link-grpc.diff: add the detection of other libs necessary for
diff --git a/debian/control b/debian/control
index 9af8137c5..dcb26c715 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,8 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build,
     libxml2-dev,
     libjsoncpp-dev, pkg-config,
     lcov, procps, help2man, zlib1g-dev,
-    g++-multilib [amd64 i386 kfreebsd-amd64 mips64 mips64el mipsel powerpc ppc64 s390 s390x sparc sparc64 x32],
+    g++-12,
+    g++-12-multilib [amd64 i386 kfreebsd-amd64 mips64 mips64el mipsel powerpc ppc64 s390 s390x sparc sparc64 x32],
     libjs-mathjax, python3-recommonmark,
     doxygen, gfortran,
     ocaml-base [amd64 arm64 armhf ppc64el riscv64 s390x] | ocaml-nox [amd64 arm64 armhf ppc64el riscv64 s390x],
diff --git a/debian/rules b/debian/rules
index 0ae7f947e..48e30bbec 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,9 +9,7 @@ TARGET_BUILD	:= build-llvm
 TARGET_BUILD_STAGE2    := $(TARGET_BUILD)/tools/clang/stage2-bins
 DEB_INST		:= $(CURDIR)/debian/tmp/
 
-GXX_VERSIONED_PACKAGE    := $(shell dpkg-query -W -f '$${Depends}' g++ | grep -o 'g++-[0-9][0-9.]*' | tail -n1 )
-GXX_VERSIONED_EXECUTABLE := $(shell dpkg -L $(GXX_VERSIONED_PACKAGE) | grep '/usr/bin/g++-[0-9][0-9.]*' | xargs ls -d | tail -n1 )
-GCC_VERSION              := $(subst /usr/bin/g++-,,$(GXX_VERSIONED_EXECUTABLE))
+GCC_VERSION              := 12
 
 LLVM_VERSION   := $(shell dpkg-parsechangelog | sed -rne "s,^Version: 1:([0-9]+).*,\1,p")
 LLVM_VERSION_FULL := $(shell dpkg-parsechangelog | sed -rne "s,^Version: 1:([0-9.]+)(~|-)(.*),\1,p")
-- 
2.40.1