[SCM] Packaging for Google Go branch, debian-sid, updated. debian/2011.02.01.1-1-27-g870582b

Ondřej Surý ondrej at sury.org
Wed Apr 20 15:21:20 UTC 2011


The following commit has been merged in the debian-sid branch:
commit d6fc8cf87e97b0316a3791ada0a19ff0487fc72d
Author: Ondřej Surý <ondrej at sury.org>
Date:   Wed Apr 20 15:49:23 2011 +0200

    Remove 002-use_GOROOT_FINAL_in_generated_binaries.patch; merged upstream

diff --git a/debian/patches/002-use_GOROOT_FINAL_in_generated_binaries.patch b/debian/patches/002-use_GOROOT_FINAL_in_generated_binaries.patch
deleted file mode 100644
index 77f9bcc..0000000
--- a/debian/patches/002-use_GOROOT_FINAL_in_generated_binaries.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/src/pkg/runtime/Makefile
-+++ b/src/pkg/runtime/Makefile
-@@ -129,7 +129,7 @@ mkversion: mkversion.c
- 	quietgcc -o $@ -I "$(GOROOT)/include" $< "$(GOROOT)/lib/lib9.a"
- 
- version.go: mkversion
--	./mkversion >version.go
-+	GOROOT=$(QUOTED_GOROOT_FINAL) ./mkversion >version.go
- 
- version_$(GOARCH).go:
- 	(echo 'package runtime'; echo 'const theGoarch = "$(GOARCH)"') >$@
---- a/src/Make.inc
-+++ b/src/Make.inc
-@@ -82,6 +82,7 @@ export GOARCH GOOS GOHOSTARCH GOHOSTOS
- nullstring :=
- space := $(nullstring) # a space at the end
- QUOTED_GOROOT:=$(subst $(space),\ ,$(GOROOT))
-+QUOTED_GOROOT_FINAL:=$(subst $(space),\ ,$(GOROOT_FINAL))
- 
- # default GOBIN
- ifndef GOBIN
diff --git a/debian/patches/series b/debian/patches/series
index 1452b1d..b341ef2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 001-allow_IPv4_on_IPv6_sockets.patch
-002-use_GOROOT_FINAL_in_generated_binaries.patch
 003-set_correct_runpath.patch
 004-dont_reinstall_dependencies_in_goinstall.patch
 005-goinstall_dont_call_home_by_default.patch

-- 
Packaging for Google Go



More information about the Pkg-google-commits mailing list