[SCM] Packaging for Google Go branch, weekly-debian-sid, updated. debian-weekly/2011.09.07-1-48-ge4a4b27

[Ondřej Surý]

The following commit has been merged in the weekly-debian-sid branch:
commit 7c7f379d019402c1090a068bea46c8d9d3889bca
Author: Ondřej Surý <ondrej at sury.org>
Date:   Wed Feb 29 15:40:36 2012 +0100

    Check for defined(__FreeBSD_kernel__) as well

diff --git a/debian/patches/011-__FreeBSD_kernel__.patch b/debian/patches/011-__FreeBSD_kernel__.patch
new file mode 100644
index 0000000..45be34f
--- /dev/null
+++ b/debian/patches/011-__FreeBSD_kernel__.patch
@@ -0,0 +1,33 @@
+--- a/include/u.h
++++ b/include/u.h
+@@ -45,7 +45,7 @@ extern "C" {
+ #	define _XOPEN_SOURCE 1000
+ #	define _XOPEN_SOURCE_EXTENDED 1
+ #endif
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ #	include <sys/cdefs.h>
+ 	/* for strtoll */
+ #	undef __ISO_C_VISIBLE
+--- a/src/cmd/dist/unix.c
++++ b/src/cmd/dist/unix.c
+@@ -653,7 +653,7 @@ main(int argc, char **argv)
+ 		gohostarch = "amd64";
+ #elif defined(__linux__)
+ 	gohostos = "linux";
+-#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ 	gohostos = "freebsd";
+ #elif defined(__OpenBSD__)
+ 	gohostos = "openbsd";
+--- a/src/lib9/dirfwstat.c
++++ b/src/lib9/dirfwstat.c
+@@ -29,7 +29,7 @@ THE SOFTWARE.
+ #include <sys/time.h>
+ #include <sys/stat.h>
+ 
+-#if defined(__FreeBSD__) || defined(__APPLE__) || defined(__OpenBSD__) || defined(__linux__)
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__APPLE__) || defined(__OpenBSD__) || defined(__linux__)
+ /* do nothing -- futimes exists and is fine */
+ 
+ #elif defined(__SunOS5_9__)
diff --git a/debian/patches/series b/debian/patches/series
index 6d31ad7..fecd35a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 007-use_native_dynamic_linker_on_kfreebsd.patch
 #009-goinstall_can_install_to_GOPATH.patch
 #010-goinstall_check_conf.patch
+011-__FreeBSD_kernel__.patch

-- 
Packaging for Google Go