Gentoo Archives: gentoo-commits

From: Sergei Trofimovich <slyfox@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/nim/, dev-lang/nim/files/
Date: Thu, 06 Oct 2016 20:55:00
Message-Id: 1475787279.8cb2adb25a4bed989e161b9bffc74038886bfd43.slyfox@gentoo
1 commit: 8cb2adb25a4bed989e161b9bffc74038886bfd43
2 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
3 AuthorDate: Thu Oct 6 20:54:39 2016 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Thu Oct 6 20:54:39 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cb2adb2
7
8 dev-lang/nim: drop MAP_ANONYMOUS constant
9
10 Fixes build failure on mipsel
11
12 Bug: https://github.com/nim-lang/Nim/pull/4853
13 Reported-by: der <AT> 2-47.ru
14
15 Package-Manager: portage-2.3.1
16
17 dev-lang/nim/files/nim-0.15.0-fix-mips-build.patch | 26 ++++++++++++++++++++++
18 .../{nim-0.15.0.ebuild => nim-0.15.0-r1.ebuild} | 2 ++
19 2 files changed, 28 insertions(+)
20
21 diff --git a/dev-lang/nim/files/nim-0.15.0-fix-mips-build.patch b/dev-lang/nim/files/nim-0.15.0-fix-mips-build.patch
22 new file mode 100644
23 index 00000000..467b55e
24 --- /dev/null
25 +++ b/dev-lang/nim/files/nim-0.15.0-fix-mips-build.patch
26 @@ -0,0 +1,26 @@
27 +From fe362543de00806a3d69ddd0de33caf0cae2e57e Mon Sep 17 00:00:00 2001
28 +From: GaveUp <gaveup@××××××.net>
29 +Date: Tue, 4 Oct 2016 10:56:07 -0500
30 +Subject: [PATCH] Revert change to osalloc.nim from commit 8d7a45f.
31 +
32 +Change caused MAP_ANONYMOUS to have an incorrect value when compiling
33 +for mipsel.
34 +
35 +Fixes #4852.
36 +---
37 + lib/system/osalloc.nim | 2 --
38 + 1 file changed, 2 deletions(-)
39 +
40 +diff --git a/lib/system/osalloc.nim b/lib/system/osalloc.nim
41 +index b07a362..316dd74 100644
42 +--- a/lib/system/osalloc.nim
43 ++++ b/lib/system/osalloc.nim
44 +@@ -87,8 +87,6 @@ elif defined(posix):
45 + const MAP_ANONYMOUS = 0x1000
46 + elif defined(solaris):
47 + const MAP_ANONYMOUS = 0x100
48 +- elif defined(linux):
49 +- const MAP_ANONYMOUS = 0x20
50 + else:
51 + var
52 + MAP_ANONYMOUS {.importc: "MAP_ANONYMOUS", header: "<sys/mman.h>".}: cint
53
54 diff --git a/dev-lang/nim/nim-0.15.0.ebuild b/dev-lang/nim/nim-0.15.0-r1.ebuild
55 similarity index 95%
56 rename from dev-lang/nim/nim-0.15.0.ebuild
57 rename to dev-lang/nim/nim-0.15.0-r1.ebuild
58 index 1e4b185..092c19f 100644
59 --- a/dev-lang/nim/nim-0.15.0.ebuild
60 +++ b/dev-lang/nim/nim-0.15.0-r1.ebuild
61 @@ -21,6 +21,8 @@ DEPEND="
62 "
63 RDEPEND="${DEPEND}"
64
65 +PATCHES=("${FILESDIR}"/${P}-fix-mips-build.patch)
66 +
67 nim_use_enable() {
68 [[ -z $2 ]] && die "usage: nim_use_enable <USE flag> <compiler flag>"
69 use $1 && echo "-d:$2"