summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2016-10-06 21:54:39 +0100
committerSergei Trofimovich <slyfox@gentoo.org>2016-10-06 21:54:39 +0100
commit8cb2adb25a4bed989e161b9bffc74038886bfd43 (patch)
treece5ce63e3fbdc7f10659875d462c0d93b1f73f8e /dev-lang/nim
parentmail-client/thunderbird-bin: version bump for security vulns (diff)
downloadgentoo-8cb2adb25a4bed989e161b9bffc74038886bfd43.tar.gz
gentoo-8cb2adb25a4bed989e161b9bffc74038886bfd43.tar.bz2
gentoo-8cb2adb25a4bed989e161b9bffc74038886bfd43.zip
dev-lang/nim: drop MAP_ANONYMOUS constant
Fixes build failure on mipsel Bug: https://github.com/nim-lang/Nim/pull/4853 Reported-by: der@2-47.ru Package-Manager: portage-2.3.1
Diffstat (limited to 'dev-lang/nim')
-rw-r--r--dev-lang/nim/files/nim-0.15.0-fix-mips-build.patch26
-rw-r--r--dev-lang/nim/nim-0.15.0-r1.ebuild (renamed from dev-lang/nim/nim-0.15.0.ebuild)2
2 files changed, 28 insertions, 0 deletions
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
new file mode 100644
index 000000000000..467b55ecdfd4
--- /dev/null
+++ b/dev-lang/nim/files/nim-0.15.0-fix-mips-build.patch
@@ -0,0 +1,26 @@
+From fe362543de00806a3d69ddd0de33caf0cae2e57e Mon Sep 17 00:00:00 2001
+From: GaveUp <gaveup@gaveup.net>
+Date: Tue, 4 Oct 2016 10:56:07 -0500
+Subject: [PATCH] Revert change to osalloc.nim from commit 8d7a45f.
+
+Change caused MAP_ANONYMOUS to have an incorrect value when compiling
+for mipsel.
+
+Fixes #4852.
+---
+ lib/system/osalloc.nim | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/lib/system/osalloc.nim b/lib/system/osalloc.nim
+index b07a362..316dd74 100644
+--- a/lib/system/osalloc.nim
++++ b/lib/system/osalloc.nim
+@@ -87,8 +87,6 @@ elif defined(posix):
+ const MAP_ANONYMOUS = 0x1000
+ elif defined(solaris):
+ const MAP_ANONYMOUS = 0x100
+- elif defined(linux):
+- const MAP_ANONYMOUS = 0x20
+ else:
+ var
+ MAP_ANONYMOUS {.importc: "MAP_ANONYMOUS", header: "<sys/mman.h>".}: cint
diff --git a/dev-lang/nim/nim-0.15.0.ebuild b/dev-lang/nim/nim-0.15.0-r1.ebuild
index 1e4b18501e42..092c19f84466 100644
--- a/dev-lang/nim/nim-0.15.0.ebuild
+++ b/dev-lang/nim/nim-0.15.0-r1.ebuild
@@ -21,6 +21,8 @@ DEPEND="
"
RDEPEND="${DEPEND}"
+PATCHES=("${FILESDIR}"/${P}-fix-mips-build.patch)
+
nim_use_enable() {
[[ -z $2 ]] && die "usage: nim_use_enable <USE flag> <compiler flag>"
use $1 && echo "-d:$2"