diff options
| -rw-r--r-- | Debian/Debhelper/Dh_Lib.pm | 2 | ||||
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rwxr-xr-x | dh | 12 | ||||
| -rwxr-xr-x | dh_auto_build | 5 | ||||
| -rwxr-xr-x | dh_auto_configure | 5 |
5 files changed, 26 insertions, 2 deletions
diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm index 174970b0..86f729ad 100644 --- a/Debian/Debhelper/Dh_Lib.pm +++ b/Debian/Debhelper/Dh_Lib.pm @@ -917,7 +917,7 @@ sub set_buildflags { $buildflags->load_config(); foreach my $flag ($buildflags->list()) { next unless $flag =~ /^[A-Z]/; # Skip flags starting with lowercase - if (! exists $ENV{$flag}) { + if (! exists $ENV{$flag} || $buildflags->get_origin($flag) eq "env") { $ENV{$flag} = $buildflags->get($flag); } } diff --git a/debian/changelog b/debian/changelog index 3be2eda4..743daa07 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,7 +12,9 @@ debhelper (8.1.7) UNRELEASED; urgency=low in --libexecdir when using autoconf. Closes: #541458 * dh_auto_build, dh_auto_configure, dh: Set environment variables listed by dpkg-buildflags --export. Any environment variables that - are already set to other values will not be changed. + are already set to other values will not be changed unless + appropriate DEB_${flag}_{APPEND,SET} environment variables are also + set (see dpkg-buildflags(1)). Closes: #544844 * Correct docs about multiarch and v9. Closes: #630826 @@ -193,6 +193,18 @@ sequence addons like this: %: dh $@ --with quilt +In order to override standard build flags, export appropriate environment +variables as documented in the L<dpkg-buildflags(1)> manual page. They will be +preferred over directly exported their counterparts (CFLAGS, CXXFLAGS, LDFLAGS +etc.). For example, to append -Wall to the standard CFLAGS and CXXFLAGS, use: + + #!/usr/bin/make -f + export DEB_CFLAGS_APPEND = -Wall + export DEB_CXXFLAGS_APPEND = -Wall + + %: + dh $@ + Here is an example of overriding where the B<dh_auto_>I<*> commands find the package's source, for a package where the source is located in a subdirectory. diff --git a/dh_auto_build b/dh_auto_build index dccd04a0..77b55eef 100755 --- a/dh_auto_build +++ b/dh_auto_build @@ -25,6 +25,11 @@ This is intended to work for about 90% of packages. If it doesn't work, you're encouraged to skip using B<dh_auto_build> at all, and just run the build process manually. +In order to override standard build flags, export appropriate environment +variables as documented in the L<dpkg-buildflags(1)> manual page. They will be +preferred over directly exported their counterparts (CFLAGS, CXXFLAGS, LDFLAGS +etc.). + =head1 OPTIONS See L<debhelper(7)/B<BUILD SYSTEM OPTIONS>> for a list of common build diff --git a/dh_auto_configure b/dh_auto_configure index daf5ed04..f08c0f6f 100755 --- a/dh_auto_configure +++ b/dh_auto_configure @@ -28,6 +28,11 @@ This is intended to work for about 90% of packages. If it doesn't work, you're encouraged to skip using B<dh_auto_configure> at all, and just run F<./configure> or its equivalent manually. +In order to override standard build flags, export appropriate environment +variables as documented in the L<dpkg-buildflags(1)> manual page. They will be +preferred over directly exported their counterparts (CFLAGS, CXXFLAGS, LDFLAGS +etc.). + =head1 OPTIONS See L<debhelper(7)/B<BUILD SYSTEM OPTIONS>> for a list of common build |