Ubuntu
llvm-toolchain-18 package

Merge ~zhsj/ubuntu/+source/llvm-toolchain-18:bug2064187 into ubuntu/+source/llvm-toolchain-18:ubuntu/noble

  1. Git
  2. lp:~zhsj/ubuntu/+source/llvm-toolchain-18
  3. bug2064187
  4. Merge into ubuntu/noble
Proposed by Shengjing Zhu
Status: Needs review
Proposed branch: ~zhsj/ubuntu/+source/llvm-toolchain-18:bug2064187
Merge into: ubuntu/+source/llvm-toolchain-18:ubuntu/noble
Diff against target: 76 lines (+16/-4)
6 files modified
debian/changelog (+8/-0)
debian/control (+2/-1)
debian/control.in (+2/-1)
debian/llvm-X.Y-linker-tools.install.in (+2/-1)
debian/llvm-X.Y-linker-tools.links.in (+1/-1)
debian/rules (+1/-0)
Reviewer Review Type Date Requested Status
Simon Chopin (community) Abstain
Review via email: mp+466494@code.launchpad.net

This proposal supersedes a proposal from 2024-05-28.

To post a comment you must log in.
Revision history for this message
Shengjing Zhu (zhsj) wrote :

PPA for testing: https://launchpad.net/~zhsj/+archive/ubuntu/bug2064187/+packages (riscv64 is still building, and may take 4 days)

Reply
Revision history for this message
Simon Chopin (schopin) wrote :

Since we explicitly disable mold, and gold isn't supported on riscv64, do we still have a linker on that architecture?

(otherwise LGTM)

Reply
Revision history for this message
Shengjing Zhu (zhsj) wrote (last edit ):

Hmm, this is already uploaded. It's always confused how to mark the MP on launchpad obsoleted.

Reply
Revision history for this message
Simon Chopin (schopin) wrote :

Alright I'll claim the review to get it off the sponsorship queue.

Reply
Revision history for this message
Simon Chopin (schopin) :
review: Abstain
Reply
Revision history for this message
Gianfranco Costamagna (costamagnagianfranco) wrote : Posted in a previous version of this proposal

Fixed already in Debian

review: Disapprove

Unmerged commits

5feb7f7... by Shengjing Zhu

Update changelog for 1:18.1.3-1ubuntu1 release

25ee071... by Shengjing Zhu

Update maintainer

b436bf2... by Shengjing Zhu

Be explicit with what ships in llvm-18-linker-tools to make sure we always ship gold

b2e9873... by Shengjing Zhu

Disable mold for all to make sure it builds gold

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index a389c51..0326d48 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,11 @@
6+llvm-toolchain-18 (1:18.1.3-1ubuntu1) noble; urgency=medium
7+
8+ * Disable mold for all to make sure it builds gold (LP: #2064187)
9+ * Be explicit with what ships in llvm-18-linker-tools to make sure we always
10+ ship gold
11+
12+ -- Shengjing Zhu <shengjing.zhu@canonical.com> Mon, 27 May 2024 16:26:20 +0800
13+
14 llvm-toolchain-18 (1:18.1.3-1) unstable; urgency=medium
15
16 * New upstream release
17diff --git a/debian/control b/debian/control
18index 46e825e..4c28723 100644
19--- a/debian/control
20+++ b/debian/control
21@@ -2,7 +2,8 @@ Source: llvm-toolchain-18
22 Section: devel
23 Priority: optional
24 Rules-Requires-Root: no
25-Maintainer: LLVM Packaging Team <pkg-llvm-team@lists.alioth.debian.org>
26+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
27+XSBC-Original-Maintainer: LLVM Packaging Team <pkg-llvm-team@lists.alioth.debian.org>
28 Uploaders: Sylvestre Ledru <sylvestre@debian.org>, Gianfranco Costamagna <locutusofborg@debian.org>
29 Build-Depends: debhelper (>= 10.0), cmake, ninja-build,
30 chrpath, texinfo, sharutils,
31diff --git a/debian/control.in b/debian/control.in
32index 04af789..3dcd43a 100644
33--- a/debian/control.in
34+++ b/debian/control.in
35@@ -2,7 +2,8 @@ Source: llvm-toolchain-@BRANCH_NAME@
36 Section: devel
37 Priority: optional
38 Rules-Requires-Root: no
39-Maintainer: LLVM Packaging Team <pkg-llvm-team@lists.alioth.debian.org>
40+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
41+XSBC-Original-Maintainer: LLVM Packaging Team <pkg-llvm-team@lists.alioth.debian.org>
42 Uploaders: Sylvestre Ledru <sylvestre@debian.org>, Gianfranco Costamagna <locutusofborg@debian.org>
43 Build-Depends: debhelper (>= 10.0), cmake, ninja-build,
44 chrpath, texinfo, sharutils,
45diff --git a/debian/llvm-X.Y-linker-tools.install.in b/debian/llvm-X.Y-linker-tools.install.in
46index 68af500..973569e 100644
47--- a/debian/llvm-X.Y-linker-tools.install.in
48+++ b/debian/llvm-X.Y-linker-tools.install.in
49@@ -1,4 +1,5 @@
50 #!/usr/bin/dh-exec
51
52 usr/lib/llvm-@LLVM_VERSION@/lib/libLTO.so.@LLVM_VERSION@.1
53-[!powerpc !powerpcspe] usr/lib/llvm-@LLVM_VERSION@/lib/LLVM*.so
54+[!powerpc !powerpcspe] usr/lib/llvm-@LLVM_VERSION@/lib/LLVMPolly.so
55+[!powerpc !powerpcspe !riscv64] usr/lib/llvm-@LLVM_VERSION@/lib/LLVMgold.so
56diff --git a/debian/llvm-X.Y-linker-tools.links.in b/debian/llvm-X.Y-linker-tools.links.in
57index cbafb15..7a4a8d6 100644
58--- a/debian/llvm-X.Y-linker-tools.links.in
59+++ b/debian/llvm-X.Y-linker-tools.links.in
60@@ -1,3 +1,3 @@
61 #!/usr/bin/dh-exec
62
63-[!powerpc !powerpcspe] usr/lib/llvm-@LLVM_VERSION@/lib/LLVMgold.so usr/lib/bfd-plugins/LLVMgold-@LLVM_VERSION@.so
64+[!powerpc !powerpcspe !riscv64] usr/lib/llvm-@LLVM_VERSION@/lib/LLVMgold.so usr/lib/bfd-plugins/LLVMgold-@LLVM_VERSION@.so
65diff --git a/debian/rules b/debian/rules
66index ec59cde..9a10ad0 100755
67--- a/debian/rules
68+++ b/debian/rules
69@@ -302,6 +302,7 @@ ifeq ($(LLVM_SPIRV_INSTALLED),yes)
70 LIBCLC_LLVM_SPIRV = -DLLVM_SPIRV=$(LLVM_SPIRV)
71 endif
72
73+MOLD_ENABLE=no
74 # Use mold as a linker. Faster than the other.
75 MOLD_DISABLE_DISTRO := bionic buster focal buster bullseye bookworm
76 ifeq (,$(filter-out $(MOLD_DISABLE_DISTRO), $(DISTRO)))

Subscribers

People subscribed via source and target branches