[Pkg-golang-commits] [golang] 01/01: Fix up "clean" especially for "build-clean-build" FTBFS / "arch:all only" builds

[Tianon Gravi]

This is an automated email from the git hooks/post-receive script.

tianon pushed a commit to branch debian-sid
in repository golang.

commit 18466b450baea37e01107dce5e776a4b7edfa044
Author: Tianon Gravi <tianon at debian.org>
Date:   Sun Sep 27 15:17:31 2015 -0700

    Fix up "clean" especially for "build-clean-build" FTBFS / "arch:all only" builds
---
 debian/rules | 33 +++++++++++++++++++++++++++------
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/debian/rules b/debian/rules
index fd7c96e..b890d6d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,11 +21,21 @@ FOR_GO_ARCH_END := done; done
 
 override_dh_auto_clean:
 	# golang-go-$os-$arch.install files are auto-generated in override_dh_install
-	rm -f debian/golang-go-*.install
-	#rm -f debian/*+
-	#rm -f debian/build.stamp
-	#rm -f test/pass.out test/run.out test/times.out
-	#rm -rf debian/home
+	rm -f debian/golang-go-*-*.install
+	# remove autogenerated files
+	rm -f \
+		src/cmd/cgo/zdefaultcc.go \
+		src/cmd/gc/opnames.h \
+		src/cmd/go/zdefaultcc.go \
+		src/liblink/anames*.c \
+		src/runtime/zaexperiment.h \
+		src/runtime/zasm_*_*.h \
+		src/runtime/zgoarch_*.go \
+		src/runtime/zgoos_*.go \
+		src/runtime/zruntime_defs_*_*.go \
+		src/runtime/zsys_*_*.s \
+		src/runtime/zversion.go
+	# remove built objects
 	rm -rf bin pkg
 
 override_dh_auto_test-arch:
@@ -34,6 +44,10 @@ override_dh_auto_test-arch:
 		export PATH="$(GOROOT)/bin:$$PATH"; \
 		eval "$$(go tool dist env)"; \
 		bash run.bash --no-rebuild;
+	# remove test artifacts
+	rm -f \
+		test/bench/shootout/6.out \
+		test/bench/shootout/*.6
 
 override_dh_compress-indep:
 	dh_compress -Xusr/share/doc/golang-doc/html -Xusr/share/doc/golang-doc/godoc
@@ -51,13 +65,20 @@ gencontrol:
 	${FOR_GO_ARCH_END}
 	mv debian/control.tmp debian/control
 
-override_dh_install:
+install-overrides:
 	-${FOR_GO_ARCH} \
 		echo "pkg/$${os}_$${arch} /usr/lib/go/pkg/" > debian/golang-go-$$os-$$arch.install; \
 		[ "$$arch" = "amd64" ] && [ "$$os" = "linux" ] \
 			&& echo "pkg/$${os}_$${arch}_race /usr/lib/go/pkg/" >> debian/golang-go-$$os-$$arch.install; \
 		echo "golang-go-$$os-$$arch: arch-independent-package-contains-binary-or-object" > debian/golang-go-$$os-$$arch.lintian-overrides; \
 	${FOR_GO_ARCH_END}
+
+override_dh_install-indep:
+	./debian/rules install-overrides
+	dh_install --fail-missing
+
+override_dh_install-arch:
+	./debian/rules install-overrides
 	# Install the native runtime/cgo.a to the golang-go package.
 	# runtime/cgo is only built for the native architecture, but the
 	# golang-go-OS-ARCH packages are built on one particular buildd, which

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-golang/golang.git