haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 04:00:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

luajit-2.0.4: Fix build on x86_64 and x86

Browse Source 
* Upstreamed via https://github.com/LuaJIT/LuaJIT/pull/316
* -lm no longer needed
This commit is contained in:
Alexander von Gluck IV
2017-04-01 10:10:09 -05:00
parent 89393edcb3
commit 547c877664
3 changed files with 29 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dev-lang/luajit/luajit-2.0.4.recipe
View File

@@ -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="

26
dev-lang/luajit/patches/luajit-2.0.4.diff Normal file
View File

@@ -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

30
dev-lang/luajit/patches/luajit-2.0.4.patchset
View File

@@ -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