diff options
| author | Ondřej Surý <ondrej@sury.org> | 2011-04-28 09:49:08 +0200 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2011-04-28 09:49:08 +0200 |
| commit | e23968e9a0a54e10bc5b7f035902b6e08cb19647 (patch) | |
| tree | 1c4e3c32ceb1a9f8e720089a901779d504fe977d | |
| parent | 71ba7469d06ac20aecb0ca567a5edf4b1e89c3f4 (diff) | |
| download | golang-e23968e9a0a54e10bc5b7f035902b6e08cb19647.tar.gz | |
Use native kfreebsd dynamic linker
| -rw-r--r-- | debian/control | 4 | ||||
| -rw-r--r-- | debian/patches/007-freebsd-hackedutils.patch | 19 |
2 files changed, 18 insertions, 5 deletions
diff --git a/debian/control b/debian/control index 7726e9fb9..10cf5eb21 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, freebsd-hackedutils [kfreebsd-amd64 kfreebsd-i386] +Build-Depends: debhelper (>= 7.4.10), bison, ed, mawk | awk, perl 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}, freebsd-hackedutils [kfreebsd-amd64 kfreebsd-i386] +Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends} 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 index d083df3ee..b5f0e0983 100644 --- a/debian/patches/007-freebsd-hackedutils.patch +++ b/debian/patches/007-freebsd-hackedutils.patch @@ -1,13 +1,26 @@ 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 +--- golang-2011.04.13.orig/src/cmd/8l/asm.c 2011-04-28 09:41:46.000000000 +0200 ++++ golang-2011.04.13/src/cmd/8l/asm.c 2011-04-28 09:45:44.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"; ++char freebsddynld[] = "/lib/ld.so.1"; int32 entryvalue(void) +Index: golang-2011.04.13/src/cmd/6l/asm.c +=================================================================== +--- golang-2011.04.13.orig/src/cmd/6l/asm.c 2011-04-28 09:42:26.000000000 +0200 ++++ golang-2011.04.13/src/cmd/6l/asm.c 2011-04-28 09:45:25.000000000 +0200 +@@ -42,7 +42,7 @@ + #define PADDR(a) ((uint32)(a) & ~0x80000000) + + char linuxdynld[] = "/lib64/ld-linux-x86-64.so.2"; +-char freebsddynld[] = "/libexec/ld-elf.so.1"; ++char freebsddynld[] = "/lib/ld-kfreebsd-x86-64.so.1"; + + char zeroes[32]; + |