Ubuntu
llvm-toolchain-18 package

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

  1. Git
  2. lp:~zhsj/ubuntu/+source/llvm-toolchain-18
  3. bug2064187
  4. Merge into ubuntu/devel
Proposed by Shengjing Zhu
Status: Superseded
Proposed branch: ~zhsj/ubuntu/+source/llvm-toolchain-18:bug2064187
Merge into: ubuntu/+source/llvm-toolchain-18:ubuntu/devel
Diff against target: 66 lines (+18/-2) (has conflicts)
4 files modified
debian/changelog (+10/-0)
debian/control (+2/-1)
debian/control.in (+2/-1)
debian/llvm-X.Y-linker-tools.install.in (+4/-0)
Conflict in debian/changelog
Conflict in debian/llvm-X.Y-linker-tools.install.in
Reviewer Review Type Date Requested Status
Gianfranco Costamagna (community) Disapprove
Review via email: mp+466493@code.launchpad.net

This proposal has been superseded by a proposal from 2024-05-28.

To post a comment you must log in.
Revision history for this message
Gianfranco Costamagna (costamagnagianfranco) wrote :

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 bbfbc31..aef4320 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,4 @@
6+<<<<<<< debian/changelog
7 llvm-toolchain-18 (1:18.1.6-1) unstable; urgency=medium
8
9 * New upstream release
10@@ -36,6 +37,15 @@ llvm-toolchain-18 (1:18.1.4-1) unstable; urgency=medium
11 * New upstream release
12
13 -- Sylvestre Ledru <sylvestre@debian.org> Thu, 18 Apr 2024 11:45:22 +0200
14+=======
15+llvm-toolchain-18 (1:18.1.3-1ubuntu1) noble; urgency=medium
16+
17+ * Disable mold for all to make sure it builds gold (LP: #2064187)
18+ * Be explicit with what ships in llvm-18-linker-tools to make sure we always
19+ ship gold
20+
21+ -- Shengjing Zhu <shengjing.zhu@canonical.com> Mon, 27 May 2024 16:26:20 +0800
22+>>>>>>> debian/changelog
23
24 llvm-toolchain-18 (1:18.1.3-1) unstable; urgency=medium
25
26diff --git a/debian/control b/debian/control
27index 46e825e..4c28723 100644
28--- a/debian/control
29+++ b/debian/control
30@@ -2,7 +2,8 @@ Source: llvm-toolchain-18
31 Section: devel
32 Priority: optional
33 Rules-Requires-Root: no
34-Maintainer: LLVM Packaging Team <pkg-llvm-team@lists.alioth.debian.org>
35+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
36+XSBC-Original-Maintainer: LLVM Packaging Team <pkg-llvm-team@lists.alioth.debian.org>
37 Uploaders: Sylvestre Ledru <sylvestre@debian.org>, Gianfranco Costamagna <locutusofborg@debian.org>
38 Build-Depends: debhelper (>= 10.0), cmake, ninja-build,
39 chrpath, texinfo, sharutils,
40diff --git a/debian/control.in b/debian/control.in
41index 04af789..3dcd43a 100644
42--- a/debian/control.in
43+++ b/debian/control.in
44@@ -2,7 +2,8 @@ Source: llvm-toolchain-@BRANCH_NAME@
45 Section: devel
46 Priority: optional
47 Rules-Requires-Root: no
48-Maintainer: LLVM Packaging Team <pkg-llvm-team@lists.alioth.debian.org>
49+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
50+XSBC-Original-Maintainer: LLVM Packaging Team <pkg-llvm-team@lists.alioth.debian.org>
51 Uploaders: Sylvestre Ledru <sylvestre@debian.org>, Gianfranco Costamagna <locutusofborg@debian.org>
52 Build-Depends: debhelper (>= 10.0), cmake, ninja-build,
53 chrpath, texinfo, sharutils,
54diff --git a/debian/llvm-X.Y-linker-tools.install.in b/debian/llvm-X.Y-linker-tools.install.in
55index d4b1175..301589f 100644
56--- a/debian/llvm-X.Y-linker-tools.install.in
57+++ b/debian/llvm-X.Y-linker-tools.install.in
58@@ -2,4 +2,8 @@
59
60 usr/lib/llvm-@LLVM_VERSION@/lib/libLTO.so.@LLVM_VERSION@.1
61 [!powerpc !powerpcspe] usr/lib/llvm-@LLVM_VERSION@/lib/LLVMPolly.so
62+<<<<<<< debian/llvm-X.Y-linker-tools.install.in
63 [!powerpc !powerpcspe !riscv64 !mips64el !armel !loong64] usr/lib/llvm-@LLVM_VERSION@/lib/LLVMgold.so
64+=======
65+[!powerpc !powerpcspe !riscv64] usr/lib/llvm-@LLVM_VERSION@/lib/LLVMgold.so
66+>>>>>>> debian/llvm-X.Y-linker-tools.install.in

Subscribers

People subscribed via source and target branches