summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchristos <christos>2014-05-15 19:35:49 +0000
committerchristos <christos>2014-05-15 19:35:49 +0000
commit1e9080e5d4acee4db931b000e267ec6c91f8b3e4 (patch)
tree763372bc10a6692bb4c97ceb38fe3c28c9ffa4a9
parenteaedb86c45979702fa8b1d8b1eb9e4e1d224e5f4 (diff)
downloadpkgsrc-1e9080e5d4acee4db931b000e267ec6c91f8b3e4.tar.gz
fix elf note computation
-rw-r--r--lang/go/Makefile3
-rw-r--r--lang/go/distinfo3
-rw-r--r--lang/go/patches/patch-src_cmd_ld_elf.c16
3 files changed, 20 insertions, 2 deletions
diff --git a/lang/go/Makefile b/lang/go/Makefile
index 59db43ec437..57d9ed18e15 100644
--- a/lang/go/Makefile
+++ b/lang/go/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2014/03/03 15:41:12 bsiegert Exp $
+# $NetBSD: Makefile,v 1.7 2014/05/15 19:35:49 christos Exp $
VERSION= 1.2.1
+PKGREVISION= 1
DISTNAME= go${VERSION}.src
PKGNAME= go-${VERSION}
CATEGORIES= lang
diff --git a/lang/go/distinfo b/lang/go/distinfo
index 80f6aaf79df..f08372b6a0b 100644
--- a/lang/go/distinfo
+++ b/lang/go/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.5 2014/03/03 15:41:12 bsiegert Exp $
+$NetBSD: distinfo,v 1.6 2014/05/15 19:35:49 christos Exp $
SHA1 (go1.2.1.src.tar.gz) = 6a4b9991eddd8039438438d6aa25126ab7e07f2f
RMD160 (go1.2.1.src.tar.gz) = ed813801a46e26952ab92be9acd145962937cc7e
Size (go1.2.1.src.tar.gz) = 9520633 bytes
+SHA1 (patch-src_cmd_ld_elf.c) = 4cdd754a7cb9c8e0a831090daa801c270f8f7a6c
diff --git a/lang/go/patches/patch-src_cmd_ld_elf.c b/lang/go/patches/patch-src_cmd_ld_elf.c
new file mode 100644
index 00000000000..bcfc022c118
--- /dev/null
+++ b/lang/go/patches/patch-src_cmd_ld_elf.c
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_cmd_ld_elf.c,v 1.1 2014/05/15 19:35:49 christos Exp $
+
+Correctly compute the note size!
+
+--- src/cmd/ld/elf.c.orig 2014-05-15 15:25:59.000000000 -0400
++++ src/cmd/ld/elf.c 2014-05-15 15:25:07.000000000 -0400
+@@ -388,7 +388,8 @@
+ {
+ int n;
+
+- n = ELF_NOTE_NETBSD_NAMESZ + ELF_NOTE_NETBSD_DESCSZ + 1;
++ n = rnd(ELF_NOTE_NETBSD_NAMESZ, 4) + rnd(ELF_NOTE_NETBSD_DESCSZ, 4);
++ n -= resoff % 4;
+ return elfnote(sh, startva, resoff, n);
+ }
+