X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;ds=sidebyside;f=bin%2Fblhc;h=70f814d954826ec36842c083e9df173eb195ac68;hb=96a8522b6c1015060a4ab55bdb5e94b816c93102;hp=b57f470ba1de315dfd2687566e784b0b1af8ea2f;hpb=d9b1d778db739a9d5b3a26aa5e43e52f9c7b569d;p=blhc%2Fblhc.git
diff --git a/bin/blhc b/bin/blhc
index b57f470..70f814d 100755
--- a/bin/blhc
+++ b/bin/blhc
@@ -24,7 +24,7 @@ use warnings;
use Getopt::Long ();
use Text::ParseWords ();
-our $VERSION = '0.01';
+our $VERSION = '0.02';
# CONSTANTS/VARIABLES
@@ -153,8 +153,7 @@ my @def_cflags = (
);
my @def_cflags_format = (
'-Wformat',
- '-Wformat-security',
- '-Werror=format-security',
+ '-Werror=format-security', # implies -Wformat-security
);
my @def_cflags_fortify = (
# fortify needs at least -O1, but -O2 is recommended anyway
@@ -227,6 +226,14 @@ my %exit_code = (
invalid_cmake => 1 << 5,
);
+my %buildd_tag = (
+ no_compiler_commands => 'I-no-compiler-commands',
+ non_verbose_build => 'W-compiler-flags-hidden',
+ flags_missing => 'W-dpkg-buildflags-missing',
+ hardening_wrapper => 'I-hardening-wrapper-used',
+ invalid_cmake => 'I-invalid-cmake-used',
+);
+
# Statistics of missing flags and non-verbose build commands. Used for
# $option_buildd.
my %statistics = (
@@ -450,8 +457,7 @@ if (not Getopt::Long::GetOptions(
'color' => \$option_color,
'arch=s' => \$option_arch,
'buildd' => \$option_buildd,
- )
- or scalar @ARGV == 0) {
+ )) {
require Pod::Usage;
Pod::Usage::pod2usage(2);
}
@@ -478,6 +484,12 @@ along with this program. If not, see .
exit 0;
}
+# Arguments missing.
+if (scalar @ARGV == 0) {
+ require Pod::Usage;
+ Pod::Usage::pod2usage(2);
+}
+
# Don't load Term::ANSIColor in buildd mode because Term::ANSIColor is not
# installed on Debian's buildds.
if (not $option_buildd) {
@@ -576,7 +588,7 @@ foreach my $file (@ARGV) {
if (not $option_buildd) {
error_invalid_cmake($1);
} else {
- print "W-invalid-cmake-used $1\n";
+ print "$buildd_tag{invalid_cmake} $1\n";
}
$exit |= $exit_code{invalid_cmake};
}
@@ -588,7 +600,7 @@ foreach my $file (@ARGV) {
if (not $option_buildd) {
error_hardening_wrapper();
} else {
- print "I-hardening-wrapper-used\n";
+ print "$buildd_tag{hardening_wrapper}\n";
}
$exit |= $exit_code{hardening_wrapper};
next FILE;
@@ -714,7 +726,7 @@ foreach my $file (@ARGV) {
if (not $option_buildd) {
print "No compiler commands!\n";
} else {
- print "W-no-compiler-commands\n";
+ print "$buildd_tag{no_compiler_commands}\n";
}
$exit |= $exit_code{no_compiler_commands};
next FILE;
@@ -962,11 +974,11 @@ if ($option_buildd) {
}
if (scalar @warning) {
local $" = ', '; # array join string
- print "W-dpkg-buildflags-missing @warning missing\n";
+ print "$buildd_tag{flags_missing} @warning missing\n";
}
if ($statistics{commands_nonverbose}) {
- printf "W-compiler-flags-hidden %d (of %d) hidden\n",
+ printf "$buildd_tag{non_verbose_build} %d (of %d) hidden\n",
$statistics{commands_nonverbose},
$statistics{commands},
}
@@ -1021,17 +1033,17 @@ changes are in effect:
=over 2
-=item
+=item *
Print tags instead of normal warnings, see L"BUILDD TAGS"> for a list of
possible tags.
-=item
+=item *
Don't check hardening flags in old log files (if dpkg-dev << 1.16.1 is
detected).
-=item
+=item *
Don't require Term::ANSIColor.
@@ -1117,17 +1129,13 @@ which is displayed.
=over 2
-=item
-
-B
+=item B
The package uses hardening-wrapper which intercepts calls to gcc and adds
hardening flags. The build log doesn't contain any hardening flags and thus
can't be checked by blhc.
-=item
-
-B (summary of hidden lines)
+=item B (summary of hidden lines)
Build log contains lines which hide the real compiler flags. For example:
@@ -1141,19 +1149,13 @@ F fixes builds with hidden compiler flags. Sometimes C<.SILENT>
in a F must be removed. And as last resort the F must be
patched to remove the C<@>s hiding the real compiler commands.
-=item
-
-B (summary of missing flags)
+=item B (summary of missing flags)
CPPFLAGS, CFLAGS, CXXFLAGS, LDFLAGS missing.
-=item
-
-B (version)
-
-=item
+=item B (version)
-B
+=item B
No compiler commands were detected. Either the log contains none or they were
not correctly detected by blhc (please report the bug in this case).