New patch. Builds everything on Dmitry's list without any stderr from
dh_golang and the built-using headers produced look reasonable.
Cheers,
mwh
On 20 April 2016 at 11:13, Michael Hudson-Doyle
<michael.hud...@canonical.com> wrote:
> On 20 April 2016 at 09:05, Dmitry Smirnov <only...@debian.org> wrote:
>> On Tuesday, 19 April 2016 12:02:10 PM AEST Michael Hudson-Doyle wrote:
>>> Are there any other packages you think would be particularly good to
>>> try to build?
>>
>> You can check the following packages, starting from top:
>
> Thanks for this list.
>
>> golang-github-aws-aws-sdk-go
>
> This manages to trigger an "Argument list too long" in my patch. New
> one coming in a little while.
>
> Cheers,
> mwh
>
>> docker-swarm
>> influxdb
>> golang-github-unknwon-com
>> cadvisor
>> golang-github-revel-revel
>> runc
>>
>> Thanks.
>>
>> --
>> Cheers,
>> Dmitry Smirnov.
From 10cd725d7996c71b1ff4784e7d0894c21d3f9d6d Mon Sep 17 00:00:00 2001
From: Michael Hudson-Doyle <michael.hud...@canonical.com>
Date: Tue, 19 Apr 2016 11:59:51 +1200
Subject: [PATCH] More dh_golang fixes
---
debian/changelog | 15 +++++++++++++++
script/dh_golang | 58 ++++++++++++++++++++++++++++++++------------------------
2 files changed, 48 insertions(+), 25 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a4b3689..451dd19 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+dh-golang (1.16) UNRELEASED; urgency=medium
+
+ * Make dh_golang more robust:
+ - Initialize the buildsystem more correctly, so --builddirectory=_build
+ works (Closes: 821350)
+ - Exit with an error if any of the 'go list' or 'dpkg-search' commands
+ fail.
+ - Quote the current working directory in the regexp used to filter out
+ files from the build directory.
+ - Store package / directory lists in files and use xargs to avoid
+ constructing over-long command lines.
+ * Also trim dh_golang's use statements.
+
+ -- Michael Hudson-Doyle <michael.hud...@ubuntu.com> Tue, 19 Apr 2016 11:42:26 +1200
+
dh-golang (1.15) unstable; urgency=medium
[ Michael Hudson-Doyle ]
diff --git a/script/dh_golang b/script/dh_golang
index 5e1e71d..d39523b 100755
--- a/script/dh_golang
+++ b/script/dh_golang
@@ -9,14 +9,8 @@ dh_golang - Generates Built-Using substvar
use strict;
use Cwd qw(realpath);
use Debian::Debhelper::Dh_Lib; # not in core
-use Dpkg; # not in core
-use Dpkg::Control; # not in core
-use Dpkg::Control::Info; # not in core
-use Dpkg::Deps; # not in core
-use Dpkg::Gettext; # not in core
-use Scalar::Util qw(blessed); # in core since v5.7.3
-use List::Util qw(first); # in core since v5.7.3
-use Debian::Debhelper::Buildsystem::golang;
+use Debian::Debhelper::Dh_Buildsystems; # not in core
+use File::Temp qw(tempdir);
=head1 SYNOPSIS
@@ -35,34 +29,48 @@ The best way to invoke B<dh_golang> is by using B<dh --with=golang>.
=cut
-init();
-
############################################################################
# Generate misc:Built-Using substvar.
############################################################################
-my $bs = Debian::Debhelper::Buildsystem::golang->new();
+buildsystems_init();
+my $bs = load_buildsystem("golang");
-$bs->_set_dh_gopkg();
$bs->_set_gopath();
my @targets = $bs->get_targets();
-my $godeps = `go list -f '{{ range .Deps }}{{.}} {{ end }}' @targets`;
-$godeps =~ s/\n/ /g;
-my @godirs = split /\n/, `go list -f '{{ .Dir }}' $godeps`;
-my $realgodirs;
-my $cwd = $bs->{cwd};
-for my $godir (@godirs) {
- my $realpath = realpath($godir);
- # @godirs will include the directories of the package being built, so exclude them.
- if ($realpath !~ /^$bs->{cwd}/) {
- $realgodirs .= realpath($godir) . " ";
+my $tmpl = '{{ range .Deps }}{{.}}
+{{ end }}';
+
+my $tmpdir = tempdir("dh_golang_XXXXXXX", TMPDIR => 1, CLEANUP => 1);
+
+system("go list -f \"$tmpl\" @targets > $tmpdir/godeps") == 0
+ or die "go list of targets failed with code $?, $!";
+
+system("sort -u $tmpdir/godeps | xargs go list -f '{{ .Dir }}' > $tmpdir/godirs") == 0
+ or die "go list of dependencies failed with code $?, $!";
+
+open(my $inp, "<", "$tmpdir/godirs");
+open(my $outp, ">", "$tmpdir/realgodirs");
+while (<$inp>) {
+ chomp;
+ my $realpath = realpath($_);
+ # godirs will include the directories of the package being built, so exclude them.
+ if ($realpath !~ /^\Q$bs->{cwd}\E/) {
+ printf $outp "%s\n", $realpath;
}
}
-my $pkgs = `dpkg-query --search $realgodirs | cut -d: -f1`;
-$pkgs =~ s/\n/ /g;
-my $built_using = `dpkg-query -f='\${source:Package} (= \${source:Version}), ' -W $pkgs`;
+close($inp);
+close($outp);
+
+system("cat $tmpdir/realgodirs | xargs dpkg-query --search > $tmpdir/pkgs") == 0
+ or die "dpkg-query --search failed with code $?, $!";
+
+my $built_using = `cut -d: -f1 $tmpdir/pkgs | sort -u | xargs dpkg-query -f='\${source:Package} (= \${source:Version}), ' -W`;
+if ($? != 0) {
+ die "dpkg-query -W failed with code $?, $!";
+}
# If there is an easier way to have a universal misc:Built-Using on all binary
# packages, I am happy to merge your patch :).
--
2.7.4
