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
diff --git a/man/Makefile.am b/man/Makefile.am
index 4f4e462..c8e282b 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -250,6 +250,7 @@ PODSUBST = $(SED) \
250 -e 's:%PKGCONFDIR%:$(pkgconfdir):g' \250 -e 's:%PKGCONFDIR%:$(pkgconfdir):g' \
251 -e 's:%PKGLIBDIR%:$(pkglibexecdir):g' \251 -e 's:%PKGLIBDIR%:$(pkglibexecdir):g' \
252 -e 's:%PKGDATADIR%:$(pkgdatadir):g' \252 -e 's:%PKGDATADIR%:$(pkgdatadir):g' \
253 -e 's:%DATADIR%:$(datadir):g' \
253 -e 's:%INSTDIR_ENVVAR%:DPKG_ROOT:g' \254 -e 's:%INSTDIR_ENVVAR%:DPKG_ROOT:g' \
254 -e 's:%ADMINDIR_ENVVAR%:DPKG_ADMINDIR:g' \255 -e 's:%ADMINDIR_ENVVAR%:DPKG_ADMINDIR:g' \
255 -e 's:%DEB_DEFAULT_COMPRESSOR%:$(DEB_DEFAULT_COMPRESSOR):g' \256 -e 's:%DEB_DEFAULT_COMPRESSOR%:$(DEB_DEFAULT_COMPRESSOR):g' \
diff --git a/man/Makefile.in b/man/Makefile.in
index 989e7cf..7e806e5 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -471,6 +471,7 @@ PODSUBST = $(SED) \
471 -e 's:%PKGCONFDIR%:$(pkgconfdir):g' \471 -e 's:%PKGCONFDIR%:$(pkgconfdir):g' \
472 -e 's:%PKGLIBDIR%:$(pkglibexecdir):g' \472 -e 's:%PKGLIBDIR%:$(pkglibexecdir):g' \
473 -e 's:%PKGDATADIR%:$(pkgdatadir):g' \473 -e 's:%PKGDATADIR%:$(pkgdatadir):g' \
474 -e 's:%DATADIR%:$(datadir):g' \
474 -e 's:%INSTDIR_ENVVAR%:DPKG_ROOT:g' \475 -e 's:%INSTDIR_ENVVAR%:DPKG_ROOT:g' \
475 -e 's:%ADMINDIR_ENVVAR%:DPKG_ADMINDIR:g' \476 -e 's:%ADMINDIR_ENVVAR%:DPKG_ADMINDIR:g' \
476 -e 's:%DEB_DEFAULT_COMPRESSOR%:$(DEB_DEFAULT_COMPRESSOR):g' \477 -e 's:%DEB_DEFAULT_COMPRESSOR%:$(DEB_DEFAULT_COMPRESSOR):g' \
diff --git a/man/dpkg-buildflags.pod b/man/dpkg-buildflags.pod
index af2198d..1dfb2df 100644
--- a/man/dpkg-buildflags.pod
+++ b/man/dpkg-buildflags.pod
@@ -558,10 +558,15 @@ artifacts.
558558
559=item B<lto>559=item B<lto>
560560
561This setting (since dpkg 1.21.0; disabled by default) enables561This setting (since dpkg 1.21.0 enables Link Time Optimization by adding
562Link Time Optimization by adding B<-flto=auto -ffat-lto-objects> to562B<-flto=auto -ffat-lto-objects> to B<CFLAGS>, B<CXXFLAGS>, B<OBJCFLAGS>,
563B<CFLAGS>, B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>,563B<OBJCXXFLAGS>, B<FFLAGS>, B<FCFLAGS> and B<LDFLAGS>.
564B<FFLAGS>, B<FCFLAGS> and B<LDFLAGS>.564
565Note: this option is enabled by default in Ubuntu on all 64bit architectures,
566except for riscv64. A list of packages with disabled LTO is maintained in
567B<%DATADIR%/lto-disabled-list/lto-disabled-list> provided by lto-disabled-list
568package.
569
565570
566=back571=back
567572
@@ -973,6 +978,17 @@ supported by B<dpkg-buildflags> into variables (since dpkg 1.16.1).
973978
974=back979=back
975980
981=head2 LTO exclusion list
982
983=over
984
985=item B<%DATADIR%/lto-disabled-list/lto-disabled-list>
986
987A text file, listing source packages and architectures where LTO should not be
988enabled, allowing the package to build without modifying it.
989
990=back
991
976=head1 EXAMPLES992=head1 EXAMPLES
977993
978To pass build flags to a build command in a Makefile:994To pass build flags to a build command in a Makefile:

Subscribers

People subscribed via source and target branches