diff -pruN 1.9.1-1/debian/changelog 1.9.1-1ubuntu1/debian/changelog --- 1.9.1-1/debian/changelog 2025-09-23 10:04:49.000000000 +0000 +++ 1.9.1-1ubuntu1/debian/changelog 2025-10-24 05:48:42.000000000 +0000 @@ -1,3 +1,13 @@ +meson (1.9.1-1ubuntu1) resolute; urgency=medium + + * Merge with Debian; remaining changes: + - d/p/lp2049904.patch: Suffix rustc link args with `-Clink-arg=-lc` + when linking against external C ABI libraries (LP: #2049904) + * Drop the llvm-20 patch, integrated upstream. + * Add LLVM 22. Why does meson have such a fixation on LLVM versions? + + -- Matthias Klose Fri, 24 Oct 2025 07:48:42 +0200 + meson (1.9.1-1) unstable; urgency=medium * New upstream release. @@ -78,6 +88,15 @@ meson (1.7.1-1) experimental; urgency=me -- Jussi Pakkanen Tue, 01 Apr 2025 23:16:18 +0300 +meson (1.7.0-1ubuntu1) plucky; urgency=medium + + * Merge with Debian; remaining changes: + - d/p/lp2049904.patch: Suffix rustc link args with `-Clink-arg=-lc` + when linking against external C ABI libraries (LP: #2049904) + - Add LLVM 20. Why does meson have such a fixation on LLVM versions? + + -- Matthias Klose Fri, 14 Feb 2025 14:06:18 +0100 + meson (1.7.0-1) unstable; urgency=medium * New upstream release. @@ -96,6 +115,20 @@ meson (1.7.0~rc1-1) experimental; urgenc -- Jussi Pakkanen Thu, 09 Jan 2025 16:55:56 +0200 +meson (1.6.1-1ubuntu2) plucky; urgency=medium + + * Add LLVM 20. Why does meson have such a fixation on LLVM versions? + + -- Matthias Klose Fri, 14 Feb 2025 13:25:20 +0100 + +meson (1.6.1-1ubuntu1) plucky; urgency=medium + + * Merge with Debian; remaining changes: + - d/p/lp2049904.patch: Suffix rustc link args with `-Clink-arg=-lc` + when linking against external C ABI libraries (LP: #2049904) + + -- Jeremy Bícha Thu, 19 Dec 2024 15:59:56 -0500 + meson (1.6.1-1) unstable; urgency=medium * New upstream release. Closes: #1083166, #1087919. diff -pruN 1.9.1-1/debian/control 1.9.1-1ubuntu1/debian/control --- 1.9.1-1/debian/control 2025-09-23 10:04:49.000000000 +0000 +++ 1.9.1-1ubuntu1/debian/control 2025-10-24 05:48:42.000000000 +0000 @@ -1,6 +1,7 @@ Source: meson -Maintainer: Jussi Pakkanen +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Jussi Pakkanen Section: devel Priority: optional Standards-Version: 4.7.2 diff -pruN 1.9.1-1/debian/patches/llvm-22.diff 1.9.1-1ubuntu1/debian/patches/llvm-22.diff --- 1.9.1-1/debian/patches/llvm-22.diff 1970-01-01 00:00:00.000000000 +0000 +++ 1.9.1-1ubuntu1/debian/patches/llvm-22.diff 2025-10-24 05:48:42.000000000 +0000 @@ -0,0 +1,20 @@ +--- a/mesonbuild/environment.py ++++ b/mesonbuild/environment.py +@@ -215,6 +215,8 @@ def get_llvm_tool_names(tool: str) -> T. + # unless it becomes a stable release. + suffixes = [ + '', # base (no suffix) ++ '-22.1', '22.1', ++ '-22', '22', + '-21.1', '21.1', + '-21', '21', + '-20.1', '20.1', +@@ -242,7 +244,7 @@ def get_llvm_tool_names(tool: str) -> T. + '-3.7', '37', + '-3.6', '36', + '-3.5', '35', +- '-20', # Debian development snapshot ++ '-23', # Debian development snapshot + '-devel', # FreeBSD development snapshot + ] + names: T.List[str] = [] diff -pruN 1.9.1-1/debian/patches/lp2049904.patch 1.9.1-1ubuntu1/debian/patches/lp2049904.patch --- 1.9.1-1/debian/patches/lp2049904.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.9.1-1ubuntu1/debian/patches/lp2049904.patch 2025-10-24 05:48:42.000000000 +0000 @@ -0,0 +1,41 @@ +From: Mate Kukri +Date: Thu, 15 Feb 2024 14:03:52 +0000 +Subject: Suffix rustc link args with `-Clink-arg=-lc` when linking against C + ABI libraries + +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/rustc/+bug/2049904 +Forwarded: no +--- + mesonbuild/backend/ninjabackend.py | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- a/mesonbuild/backend/ninjabackend.py ++++ b/mesonbuild/backend/ninjabackend.py +@@ -2059,6 +2059,7 @@ class NinjaBackend(backends.Backend): + linkdirs = mesonlib.OrderedSet() + external_deps = target.external_deps.copy() + target_deps = target.get_dependencies() ++ have_c_abi_libs = False + for d in target_deps: + linkdirs.add(d.subdir) + deps.append(self.get_dependency_filename(d)) +@@ -2075,6 +2076,8 @@ class NinjaBackend(backends.Backend): + args += ['--extern', '{}={}'.format(d_name, self.get_target_filename(d))] + project_deps.append(RustDep(d_name, self.rust_crates[d.name].order)) + continue ++ else: ++ have_c_abi_libs = True + + # Link a C ABI library + +@@ -2123,6 +2126,10 @@ class NinjaBackend(backends.Backend): + + args.append(f'-Clink-arg={a}') + ++ # LP: #2049904 Link with libc last if we have C ABI libraries ++ if have_c_abi_libs: ++ args.append("-Clink-arg=-lc") ++ + for d in linkdirs: + d = d or '.' + args.append(f'-L{d}') diff -pruN 1.9.1-1/debian/patches/series 1.9.1-1ubuntu1/debian/patches/series --- 1.9.1-1/debian/patches/series 2025-09-23 10:04:35.000000000 +0000 +++ 1.9.1-1ubuntu1/debian/patches/series 2025-10-24 05:48:42.000000000 +0000 @@ -1,2 +1,4 @@ 1-disable-openmpi.patch 2-disable-rootdir-test.patch +lp2049904.patch +llvm-22.diff