Ubuntu
dpkg package

Merge ~kadamski/ubuntu/+source/dpkg:lp.2059107 into ubuntu/+source/dpkg:ubuntu/devel

  1. Git
  2. lp:~kadamski/ubuntu/+source/dpkg
  3. lp.2059107
  4. Merge into ubuntu/devel
Proposed by Krzysztof Adamski
Status: Merged
Merge reported by: Andreas Hasenack
Merged at revision: 0c063203b30298a882abaf6292c637cc0b8782fc
Proposed branch: ~kadamski/ubuntu/+source/dpkg:lp.2059107
Merge into: ubuntu/+source/dpkg:ubuntu/devel
Diff against target: 66 lines (+22/-4)
3 files modified
man/Makefile.am (+1/-0)
man/Makefile.in (+1/-0)
man/dpkg-buildflags.pod (+20/-4)
Reviewer Review Type Date Requested Status
Andreas Hasenack Approve
Ubuntu Sponsors Pending
Review via email: mp+463128@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Dan Bungert (dbungert) wrote :

Krzysztof - thanks for the manpage improvement!

I have uploaded with the following changes:
* changelog entry added
* tweaks to wording to simplify future merges and around wording of the lto exclusion list

Revision history for this message
Krzysztof Adamski (kadamski) wrote :

Hi Dan, thank you. I looked into that again now and I see that there is no closing parenthesis after "since dpkg 1.21.0" in my change, I hope you did notice and fixed that (I honestly don't know how to check your changes). Sorry for this typo.

Revision history for this message
Andreas Hasenack (ahasenack) wrote :

This made it into oracular via https://launchpad.net/ubuntu/+source/dpkg/1.22.6ubuntu8

Closing MP.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/man/Makefile.am b/man/Makefile.am
2index 4f4e462..c8e282b 100644
3--- a/man/Makefile.am
4+++ b/man/Makefile.am
5@@ -250,6 +250,7 @@ PODSUBST = $(SED) \
6 -e 's:%PKGCONFDIR%:$(pkgconfdir):g' \
7 -e 's:%PKGLIBDIR%:$(pkglibexecdir):g' \
8 -e 's:%PKGDATADIR%:$(pkgdatadir):g' \
9+ -e 's:%DATADIR%:$(datadir):g' \
10 -e 's:%INSTDIR_ENVVAR%:DPKG_ROOT:g' \
11 -e 's:%ADMINDIR_ENVVAR%:DPKG_ADMINDIR:g' \
12 -e 's:%DEB_DEFAULT_COMPRESSOR%:$(DEB_DEFAULT_COMPRESSOR):g' \
13diff --git a/man/Makefile.in b/man/Makefile.in
14index 989e7cf..7e806e5 100644
15--- a/man/Makefile.in
16+++ b/man/Makefile.in
17@@ -471,6 +471,7 @@ PODSUBST = $(SED) \
18 -e 's:%PKGCONFDIR%:$(pkgconfdir):g' \
19 -e 's:%PKGLIBDIR%:$(pkglibexecdir):g' \
20 -e 's:%PKGDATADIR%:$(pkgdatadir):g' \
21+ -e 's:%DATADIR%:$(datadir):g' \
22 -e 's:%INSTDIR_ENVVAR%:DPKG_ROOT:g' \
23 -e 's:%ADMINDIR_ENVVAR%:DPKG_ADMINDIR:g' \
24 -e 's:%DEB_DEFAULT_COMPRESSOR%:$(DEB_DEFAULT_COMPRESSOR):g' \
25diff --git a/man/dpkg-buildflags.pod b/man/dpkg-buildflags.pod
26index af2198d..1dfb2df 100644
27--- a/man/dpkg-buildflags.pod
28+++ b/man/dpkg-buildflags.pod
29@@ -558,10 +558,15 @@ artifacts.
30
31 =item B<lto>
32
33-This setting (since dpkg 1.21.0; disabled by default) enables
34-Link Time Optimization by adding B<-flto=auto -ffat-lto-objects> to
35-B<CFLAGS>, B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>,
36-B<FFLAGS>, B<FCFLAGS> and B<LDFLAGS>.
37+This setting (since dpkg 1.21.0 enables Link Time Optimization by adding
38+B<-flto=auto -ffat-lto-objects> to B<CFLAGS>, B<CXXFLAGS>, B<OBJCFLAGS>,
39+B<OBJCXXFLAGS>, B<FFLAGS>, B<FCFLAGS> and B<LDFLAGS>.
40+
41+Note: this option is enabled by default in Ubuntu on all 64bit architectures,
42+except for riscv64. A list of packages with disabled LTO is maintained in
43+B<%DATADIR%/lto-disabled-list/lto-disabled-list> provided by lto-disabled-list
44+package.
45+
46
47 =back
48
49@@ -973,6 +978,17 @@ supported by B<dpkg-buildflags> into variables (since dpkg 1.16.1).
50
51 =back
52
53+=head2 LTO exclusion list
54+
55+=over
56+
57+=item B<%DATADIR%/lto-disabled-list/lto-disabled-list>
58+
59+A text file, listing source packages and architectures where LTO should not be
60+enabled, allowing the package to build without modifying it.
61+
62+=back
63+
64 =head1 EXAMPLES
65
66 To pass build flags to a build command in a Makefile:

Subscribers

People subscribed via source and target branches