From 547c877664fc717d59f95eded89b9831754cb526 Mon Sep 17 00:00:00 2001
From: Alexander von Gluck IV <kallisti5@unixzen.com>
Date: Sat, 1 Apr 2017 10:10:09 -0500
Subject: [PATCH] luajit-2.0.4: Fix build on x86_64 and x86

* Upstreamed via https://github.com/LuaJIT/LuaJIT/pull/316
* -lm no longer needed
---
 dev-lang/luajit/luajit-2.0.4.recipe           |  6 ++--
 dev-lang/luajit/patches/luajit-2.0.4.diff     | 26 ++++++++++++++++
 dev-lang/luajit/patches/luajit-2.0.4.patchset | 30 -------------------
 3 files changed, 29 insertions(+), 33 deletions(-)
 create mode 100644 dev-lang/luajit/patches/luajit-2.0.4.diff
 delete mode 100644 dev-lang/luajit/patches/luajit-2.0.4.patchset

diff --git a/dev-lang/luajit/luajit-2.0.4.recipe b/dev-lang/luajit/luajit-2.0.4.recipe
index 02d94d15a..6dcf99678 100644
--- a/dev-lang/luajit/luajit-2.0.4.recipe
+++ b/dev-lang/luajit/luajit-2.0.4.recipe
@@ -5,13 +5,13 @@ language. LuaJIT is a Just-In-Time Compiler (JIT) for it."
 HOMEPAGE="http://luajit.org/luajit.html"
 COPYRIGHT="2005-2015 Mike Pall"
 LICENSE="MIT"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="http://luajit.org/download/LuaJIT-$portVersion.tar.gz"
 CHECKSUM_SHA256="620fa4eb12375021bef6e4f237cbd2dd5d49e56beb414bee052c746beef1807d"
 SOURCE_DIR="LuaJIT-$portVersion"
-PATCHES="luajit-$portVersion.patchset"
+PATCHES="luajit-$portVersion.diff"
 
-ARCHITECTURES="x86 !x86_gcc2"
+ARCHITECTURES="x86 x86_64 !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
diff --git a/dev-lang/luajit/patches/luajit-2.0.4.diff b/dev-lang/luajit/patches/luajit-2.0.4.diff
new file mode 100644
index 000000000..ce55179ee
--- /dev/null
+++ b/dev-lang/luajit/patches/luajit-2.0.4.diff
@@ -0,0 +1,26 @@
+diff --git a/src/lj_alloc.c b/src/lj_alloc.c
+index 7c7ec67..bdf27d9 100644
+--- a/src/lj_alloc.c
++++ b/src/lj_alloc.c
+@@ -194,7 +194,7 @@ static LJ_AINLINE void *CALL_MMAP(size_t size)
+   return ptr;
+ }
+ 
+-#elif LJ_TARGET_OSX || LJ_TARGET_PS4 || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__sun__)
++#elif LJ_TARGET_OSX || LJ_TARGET_PS4 || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__sun__) || defined(__HAIKU__)
+ 
+ /* OSX and FreeBSD mmap() use a naive first-fit linear search.
+ ** That's perfect for us. Except that -pagezero_size must be set for OSX,
+diff --git a/src/lj_arch.h b/src/lj_arch.h
+index d3a9d57..e551ac5 100644
+--- a/src/lj_arch.h
++++ b/src/lj_arch.h
+@@ -70,6 +70,8 @@
+        defined(__NetBSD__) || defined(__OpenBSD__) || \
+        defined(__DragonFly__)) && !defined(__ORBIS__)
+ #define LUAJIT_OS	LUAJIT_OS_BSD
++#elif defined(__HAIKU__)
++#define LUAJIT_OS  LUAJIT_OS_POSIX
+ #elif (defined(__sun__) && defined(__svr4__)) || defined(__CYGWIN__)
+ #define LUAJIT_OS	LUAJIT_OS_POSIX
+ #else
diff --git a/dev-lang/luajit/patches/luajit-2.0.4.patchset b/dev-lang/luajit/patches/luajit-2.0.4.patchset
deleted file mode 100644
index af924a6f4..000000000
--- a/dev-lang/luajit/patches/luajit-2.0.4.patchset
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Adrien Destugues <pulkomandy@pulkomandy.tk>
-Date: Sun, 12 Jan 2014 22:49:01 +0100
-Subject: Remove hardcoded -lm.
-
-
-diff --git a/src/Makefile b/src/Makefile
-index 1d38fa2..9fe3ee9 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -201,7 +201,7 @@ TARGET_DYNXLDOPTS=
- TARGET_LFSFLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
- TARGET_XCFLAGS= $(TARGET_LFSFLAGS) -U_FORTIFY_SOURCE
- TARGET_XLDFLAGS=
--TARGET_XLIBS= -lm
-+#TARGET_XLIBS= -lm
- TARGET_TCFLAGS= $(CCOPTIONS) $(TARGET_XCFLAGS) $(TARGET_FLAGS) $(TARGET_CFLAGS)
- TARGET_ACFLAGS= $(CCOPTIONS) $(TARGET_XCFLAGS) $(TARGET_FLAGS) $(TARGET_CFLAGS)
- TARGET_ALDFLAGS= $(LDOPTIONS) $(TARGET_XLDFLAGS) $(TARGET_FLAGS) $(TARGET_LDFLAGS)
-@@ -358,7 +358,7 @@ endif
- ##############################################################################
- 
- MINILUA_O= host/minilua.o
--MINILUA_LIBS= -lm
-+#MINILUA_LIBS= -lm
- MINILUA_T= host/minilua
- MINILUA_X= $(MINILUA_T)
- 
--- 
-2.7.0
-