Merge ~paelzer/ubuntu/+source/pmdk:fix-FTBFS-LTO-HIRSUTE into ubuntu/+source/pmdk:ubuntu/hirsute-devel

Proposed by Christian Ehrhardt 
Status: Merged
Approved by: Christian Ehrhardt 
Approved revision: 415503f60b0317911c826ffefde1e8dc786e8073
Merged at revision: 415503f60b0317911c826ffefde1e8dc786e8073
Proposed branch: ~paelzer/ubuntu/+source/pmdk:fix-FTBFS-LTO-HIRSUTE
Merge into: ubuntu/+source/pmdk:ubuntu/hirsute-devel
Diff against target: 46 lines (+15/-2)
3 files modified
debian/changelog (+7/-0)
debian/control (+2/-1)
debian/rules (+6/-1)
Reviewer Review Type Date Requested Status
Utkarsh Gupta (community) Approve
Canonical Server Team Pending
Canonical Server packageset reviewers Pending
Ubuntu Server Dev import team Pending
Review via email: mp+400386@code.launchpad.net
To post a comment you must log in.
Utkarsh Gupta (utkarsh) wrote :

Hello,

Small minor fix I'd like to recommend below before going towards the other checks.

review: Needs Fixing
Christian Ehrhardt  (paelzer) wrote :

It is not too much to ask, I thought the hint in the changelog is enough - but I agree, a few lines can help.
Fixed and pushed to this branch ... ready for re-reivew

Utkarsh Gupta (utkarsh) wrote :

* Changelog:
  - [✔] changelog entry correct version and targeted codename
  - [✔] changelog entries correct
  - [✔] update-maintainer has been run

* Actual changes:
  - [✔] no upstream changes to consider
  - [✔] no further upstream version to consider
  - [✔] debian changes look safe

* New Delta:
  - [✔] no new patches added
  - [✔] changes reproted upstream

* Build/Test:
  - [✔] build is ok
  - [✔] verified PPA package installs/uninstalls
  - [✔] autopkgtest against the PPA package passes
  - [✔] sanity checks test fine

+1, LGTM; thanks! \o/

review: Approve
Christian Ehrhardt  (paelzer) wrote :

To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/pmdk
 * [new tag] upload/1.10-1ubuntu1 -> upload/1.10-1ubuntu1

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading pmdk_1.10-1ubuntu1.dsc: done.
  Uploading pmdk_1.10-1ubuntu1.debian.tar.xz: done.
  Uploading pmdk_1.10-1ubuntu1_source.buildinfo: done.
  Uploading pmdk_1.10-1ubuntu1_source.changes: done.
Successfully uploaded packages.

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 dbe8a11..d43784e 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,10 @@
6+pmdk (1.10-1ubuntu1) hirsute; urgency=medium
7+
8+ * d/rules: Disable LTO as it makes src:pmdk an FTFBS.
9+ See https://github.com/pmem/pmdk/issues/5197
10+
11+ -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Tue, 30 Mar 2021 14:56:25 +0200
12+
13 pmdk (1.10-1) unstable; urgency=medium
14
15 * New upstream release.
16diff --git a/debian/control b/debian/control
17index 1a2644e..2d22732 100644
18--- a/debian/control
19+++ b/debian/control
20@@ -1,7 +1,8 @@
21 Source: pmdk
22 Section: libs
23 Priority: optional
24-Maintainer: Adam Borowski <kilobyte@angband.pl>
25+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
26+XSBC-Original-Maintainer: Adam Borowski <kilobyte@angband.pl>
27 Build-Depends: bash-completion,
28 bc,
29 debhelper-compat (= 12),
30diff --git a/debian/rules b/debian/rules
31index 7eb41e0..134e00e 100755
32--- a/debian/rules
33+++ b/debian/rules
34@@ -1,6 +1,11 @@
35 #!/usr/bin/make -f
36
37-export DEB_BUILD_MAINT_OPTIONS = hardening=+all
38+# Broken by
39+# https://wiki.ubuntu.com/ToolChain/LTO
40+# eventually resolved by
41+# upstream https://github.com/pmem/pmdk/issues/5197
42+# Until then adding optimize=-lto
43+export DEB_BUILD_MAINT_OPTIONS = hardening=+all optimize=-lto
44
45 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
46 DEB_UPSTREAM_VERSION = $(shell dpkg-parsechangelog -S version | cut -d - -f 1 | cut -d : -f 2)

Subscribers

People subscribed via source and target branches