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
diff --git a/debian/changelog b/debian/changelog
index a389c51..0326d48 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
1llvm-toolchain-18 (1:18.1.3-1ubuntu1) noble; urgency=medium
2
3 * Disable mold for all to make sure it builds gold (LP: #2064187)
4 * Be explicit with what ships in llvm-18-linker-tools to make sure we always
5 ship gold
6
7 -- Shengjing Zhu <shengjing.zhu@canonical.com> Mon, 27 May 2024 16:26:20 +0800
8
1llvm-toolchain-18 (1:18.1.3-1) unstable; urgency=medium9llvm-toolchain-18 (1:18.1.3-1) unstable; urgency=medium
210
3 * New upstream release11 * New upstream release
diff --git a/debian/control b/debian/control
index 46e825e..4c28723 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,8 @@ Source: llvm-toolchain-18
2Section: devel2Section: devel
3Priority: optional3Priority: optional
4Rules-Requires-Root: no4Rules-Requires-Root: no
5Maintainer: LLVM Packaging Team <pkg-llvm-team@lists.alioth.debian.org>5Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
6XSBC-Original-Maintainer: LLVM Packaging Team <pkg-llvm-team@lists.alioth.debian.org>
6Uploaders: Sylvestre Ledru <sylvestre@debian.org>, Gianfranco Costamagna <locutusofborg@debian.org>7Uploaders: Sylvestre Ledru <sylvestre@debian.org>, Gianfranco Costamagna <locutusofborg@debian.org>
7Build-Depends: debhelper (>= 10.0), cmake, ninja-build,8Build-Depends: debhelper (>= 10.0), cmake, ninja-build,
8 chrpath, texinfo, sharutils,9 chrpath, texinfo, sharutils,
diff --git a/debian/control.in b/debian/control.in
index 04af789..3dcd43a 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -2,7 +2,8 @@ Source: llvm-toolchain-@BRANCH_NAME@
2Section: devel2Section: devel
3Priority: optional3Priority: optional
4Rules-Requires-Root: no4Rules-Requires-Root: no
5Maintainer: LLVM Packaging Team <pkg-llvm-team@lists.alioth.debian.org>5Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
6XSBC-Original-Maintainer: LLVM Packaging Team <pkg-llvm-team@lists.alioth.debian.org>
6Uploaders: Sylvestre Ledru <sylvestre@debian.org>, Gianfranco Costamagna <locutusofborg@debian.org>7Uploaders: Sylvestre Ledru <sylvestre@debian.org>, Gianfranco Costamagna <locutusofborg@debian.org>
7Build-Depends: debhelper (>= 10.0), cmake, ninja-build,8Build-Depends: debhelper (>= 10.0), cmake, ninja-build,
8 chrpath, texinfo, sharutils,9 chrpath, texinfo, sharutils,
diff --git a/debian/llvm-X.Y-linker-tools.install.in b/debian/llvm-X.Y-linker-tools.install.in
index 68af500..973569e 100644
--- a/debian/llvm-X.Y-linker-tools.install.in
+++ b/debian/llvm-X.Y-linker-tools.install.in
@@ -1,4 +1,5 @@
1#!/usr/bin/dh-exec1#!/usr/bin/dh-exec
22
3usr/lib/llvm-@LLVM_VERSION@/lib/libLTO.so.@LLVM_VERSION@.13usr/lib/llvm-@LLVM_VERSION@/lib/libLTO.so.@LLVM_VERSION@.1
4[!powerpc !powerpcspe] usr/lib/llvm-@LLVM_VERSION@/lib/LLVM*.so4[!powerpc !powerpcspe] usr/lib/llvm-@LLVM_VERSION@/lib/LLVMPolly.so
5[!powerpc !powerpcspe !riscv64] usr/lib/llvm-@LLVM_VERSION@/lib/LLVMgold.so
diff --git a/debian/llvm-X.Y-linker-tools.links.in b/debian/llvm-X.Y-linker-tools.links.in
index cbafb15..7a4a8d6 100644
--- a/debian/llvm-X.Y-linker-tools.links.in
+++ b/debian/llvm-X.Y-linker-tools.links.in
@@ -1,3 +1,3 @@
1#!/usr/bin/dh-exec1#!/usr/bin/dh-exec
22
3[!powerpc !powerpcspe] usr/lib/llvm-@LLVM_VERSION@/lib/LLVMgold.so usr/lib/bfd-plugins/LLVMgold-@LLVM_VERSION@.so3[!powerpc !powerpcspe !riscv64] usr/lib/llvm-@LLVM_VERSION@/lib/LLVMgold.so usr/lib/bfd-plugins/LLVMgold-@LLVM_VERSION@.so
diff --git a/debian/rules b/debian/rules
index ec59cde..9a10ad0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -302,6 +302,7 @@ ifeq ($(LLVM_SPIRV_INSTALLED),yes)
302 LIBCLC_LLVM_SPIRV = -DLLVM_SPIRV=$(LLVM_SPIRV)302 LIBCLC_LLVM_SPIRV = -DLLVM_SPIRV=$(LLVM_SPIRV)
303endif303endif
304304
305MOLD_ENABLE=no
305# Use mold as a linker. Faster than the other.306# Use mold as a linker. Faster than the other.
306MOLD_DISABLE_DISTRO := bionic buster focal buster bullseye bookworm307MOLD_DISABLE_DISTRO := bionic buster focal buster bullseye bookworm
307ifeq (,$(filter-out $(MOLD_DISABLE_DISTRO), $(DISTRO)))308ifeq (,$(filter-out $(MOLD_DISABLE_DISTRO), $(DISTRO)))

Subscribers

People subscribed via source and target branches