diff options
| author | Ondřej Surý <ondrej@sury.org> | 2011-04-27 14:01:04 +0200 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2011-04-27 14:01:04 +0200 |
| commit | c28647427cd167316d88f13f79afbda3962f7ff2 (patch) | |
| tree | 5e1d316eacce2b445525623767d90416f92c73d7 | |
| parent | 0dad9631b9433e705545c66fb587ebe2d32267d6 (diff) | |
| download | golang-c28647427cd167316d88f13f79afbda3962f7ff2.tar.gz | |
Fix kfreebsd builds by depending on freebsd-hackedutils and fixing upstream path for i386
| -rw-r--r-- | debian/control | 4 | ||||
| -rw-r--r-- | debian/patches/007-freebsd-hackedutils.patch | 13 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 16 insertions, 2 deletions
diff --git a/debian/control b/debian/control index 10cf5eb21..c1cfa8679 100644 --- a/debian/control +++ b/debian/control @@ -4,13 +4,13 @@ Priority: optional Maintainer: Ondřej Surý <ondrej@debian.org> Vcs-Browser: https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi?p=pkg-google/golang.git Vcs-Git: git://scm.alioth.debian.org/git/pkg-google/golang.git -Build-Depends: debhelper (>= 7.4.10), bison, ed, mawk | awk, perl +Build-Depends: debhelper (>= 7.4.10), bison, ed, mawk | awk, perl, freebsd-hackedutils [freebsd-amd64 freebsd-i386] Standards-Version: 3.9.1 Homepage: http://golang.org/ Package: golang-go Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64 armel armhf -Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, freebsd-hackedutils [freebsd-amd64 freebsd-i386] Recommends: golang-tools Provides: go-compiler Description: Go programming language compiler diff --git a/debian/patches/007-freebsd-hackedutils.patch b/debian/patches/007-freebsd-hackedutils.patch new file mode 100644 index 000000000..d083df3ee --- /dev/null +++ b/debian/patches/007-freebsd-hackedutils.patch @@ -0,0 +1,13 @@ +Index: golang-2011.04.13/src/cmd/8l/asm.c +=================================================================== +--- golang-2011.04.13.orig/src/cmd/8l/asm.c 2011-04-27 13:56:01.000000000 +0200 ++++ golang-2011.04.13/src/cmd/8l/asm.c 2011-04-27 13:56:18.000000000 +0200 +@@ -40,7 +40,7 @@ + #define Dbufslop 100 + + char linuxdynld[] = "/lib/ld-linux.so.2"; +-char freebsddynld[] = "/usr/libexec/ld-elf.so.1"; ++char freebsddynld[] = "/libexec/ld-elf.so.1"; + + int32 + entryvalue(void) diff --git a/debian/patches/series b/debian/patches/series index 458a32d2c..158864e1e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ +007-freebsd-hackedutils.patch 001-allow_IPv4_on_IPv6_sockets.patch 003-set_correct_runpath.patch 004-dont_reinstall_dependencies_in_goinstall.patch |