Update luajit to a newer checkout from the 2.0 git branch; upstream say
"Releases are only made occasionally. You're strongly encouraged to follow the git branches". powerpc help from cwen@, this can now move from being built with ports-gcc to clang. Reenable build on (32-bit) arm; it was previously disabled as it required EABI, which we switched to using some time ago now - not tested on arm yet but this will at least give it a chance.
This commit is contained in:
sthen
parent
0ce722a546
commit
4f170e8826
|
|
@ -1,39 +1,39 @@
|
|||
# $OpenBSD: Makefile,v 1.31 2020/08/10 00:56:40 jca Exp $
|
||||
# $OpenBSD: Makefile,v 1.32 2021/07/03 20:21:07 sthen Exp $
|
||||
|
||||
# ../src/luajit2/src/lj_arch.h:55:2: error: #error "No support for
|
||||
# this architecture (yet)"
|
||||
ONLY_FOR_ARCHS = powerpc i386 amd64
|
||||
# arm needs missing EABI symbols
|
||||
ONLY_FOR_ARCHS = arm amd64 i386 powerpc
|
||||
# if changing the above and it actually builds, switch to using
|
||||
# luajit in mail/rspamd
|
||||
# - arm added speculatively, so not added in rspamd yet.
|
||||
#
|
||||
# no aarch64 support in luajit 2.0 branch
|
||||
# games/tome4 is using embedded copy of luajit
|
||||
# if changing, sync in mail/rspamd
|
||||
|
||||
SHARED_LIBS += luajit-${MODLUA_VERSION} 1.0 # 2.0.5
|
||||
|
||||
# "Releases are only made occasionally. You're strongly encouraged to follow
|
||||
# the git branches"
|
||||
GH_ACCOUNT = LuaJIT
|
||||
GH_PROJECT = LuaJIT
|
||||
GH_COMMIT = 98f95f69180d48ce49289d6428b46a9ccdd67a46
|
||||
|
||||
COMMENT = just-in-time compiler for Lua
|
||||
V = 2.0.5
|
||||
REVISION = 2
|
||||
DISTNAME = LuaJIT-${V}
|
||||
DISTNAME = LuaJIT-${V}pl20210608
|
||||
PKGNAME = ${DISTNAME:L}
|
||||
|
||||
CATEGORIES = lang
|
||||
|
||||
HOMEPAGE = http://luajit.org/
|
||||
HOMEPAGE = https://luajit.org/
|
||||
|
||||
# MIT
|
||||
PERMIT_PACKAGE = Yes
|
||||
|
||||
WANTLIB = c m
|
||||
|
||||
MASTER_SITES = ${HOMEPAGE}download/
|
||||
|
||||
MODULES = lang/lua
|
||||
MODLUA_SA= Yes
|
||||
MODLUA_VERSION= 5.1
|
||||
|
||||
MODULES += gcc4
|
||||
MODGCC4_ARCHS = powerpc
|
||||
MODGCC4_LANGS = c
|
||||
|
||||
MAKE_FLAGS += \
|
||||
CC="${CC}" \
|
||||
CCOPT="${CFLAGS}" \
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
SHA256 (LuaJIT-2.0.5.tar.gz) = h0sfgpfGl4IfVh+bc7V//UGe2PQnjILgW0iAbTDB6Xk=
|
||||
SIZE (LuaJIT-2.0.5.tar.gz) = 849845
|
||||
SHA256 (LuaJIT-2.0.5pl20210608-98f95f69.tar.gz) = wmjMMUjuUzRqfRu4plfFqD7otJefP7Wwj67uj4mDfdQ=
|
||||
SIZE (LuaJIT-2.0.5pl20210608-98f95f69.tar.gz) = 844346
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
$OpenBSD: patch-Makefile,v 1.6 2017/05/05 10:21:47 jsg Exp $
|
||||
--- Makefile.orig Tue May 2 04:11:00 2017
|
||||
+++ Makefile Tue May 2 11:40:27 2017
|
||||
$OpenBSD: patch-Makefile,v 1.7 2021/07/03 20:21:07 sthen Exp $
|
||||
|
||||
Index: Makefile
|
||||
--- Makefile.orig
|
||||
+++ Makefile
|
||||
@@ -17,7 +17,7 @@ MAJVER= 2
|
||||
MINVER= 0
|
||||
RELVER= 5
|
||||
|
|
@ -15,7 +17,7 @@ $OpenBSD: patch-Makefile,v 1.6 2017/05/05 10:21:47 jsg Exp $
|
|||
$(RM) $(INSTALL_TSYM) $(INSTALL_DYN) $(INSTALL_SHORT1) $(INSTALL_SHORT2)
|
||||
cd src && test -f $(FILE_SO) && \
|
||||
- $(INSTALL_X) $(FILE_SO) $(INSTALL_DYN) && \
|
||||
- $(LDCONFIG) $(INSTALL_LIB) && \
|
||||
- ( $(LDCONFIG) $(INSTALL_LIB) || : ) && \
|
||||
- $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT1) && \
|
||||
- $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT2) || :
|
||||
+ $(INSTALL_X) $(FILE_SO) $(INSTALL_DYN) || :
|
||||
|
|
|
|||
|
|
@ -1,7 +1,9 @@
|
|||
$OpenBSD: patch-src_Makefile,v 1.6 2017/05/05 10:21:47 jsg Exp $
|
||||
--- src/Makefile.orig Tue May 2 04:11:00 2017
|
||||
+++ src/Makefile Tue May 2 11:40:27 2017
|
||||
@@ -326,6 +326,10 @@ else
|
||||
$OpenBSD: patch-src_Makefile,v 1.7 2021/07/03 20:21:07 sthen Exp $
|
||||
|
||||
Index: src/Makefile
|
||||
--- src/Makefile.orig
|
||||
+++ src/Makefile
|
||||
@@ -331,6 +331,10 @@ else
|
||||
ifeq (GNU/kFreeBSD,$(TARGET_SYS))
|
||||
TARGET_XLIBS+= -ldl
|
||||
endif
|
||||
|
|
@ -12,7 +14,7 @@ $OpenBSD: patch-src_Makefile,v 1.6 2017/05/05 10:21:47 jsg Exp $
|
|||
endif
|
||||
endif
|
||||
endif
|
||||
@@ -562,10 +566,10 @@ endif
|
||||
@@ -568,10 +572,10 @@ endif
|
||||
endif
|
||||
endif
|
||||
|
||||
|
|
|
|||
|
|
@ -1,14 +0,0 @@
|
|||
$OpenBSD: patch-src_jit_bcsave_lua,v 1.1 2018/10/22 19:16:25 kettenis Exp $
|
||||
|
||||
Index: src/jit/bcsave.lua
|
||||
--- src/jit/bcsave.lua.orig
|
||||
+++ src/jit/bcsave.lua
|
||||
@@ -275,7 +275,7 @@ typedef struct {
|
||||
o.sect[2].size = fofs(ofs)
|
||||
o.sect[3].type = f32(3) -- .strtab
|
||||
o.sect[3].ofs = fofs(sofs + ofs)
|
||||
- o.sect[3].size = fofs(#symname+1)
|
||||
+ o.sect[3].size = fofs(#symname+2)
|
||||
ffi.copy(o.space+ofs+1, symname)
|
||||
ofs = ofs + #symname + 2
|
||||
o.sect[4].type = f32(1) -- .rodata
|
||||
|
|
@ -1,13 +1,18 @@
|
|||
$OpenBSD: patch-src_lj_arch_h,v 1.5 2017/05/05 10:21:47 jsg Exp $
|
||||
--- src/lj_arch.h.orig Tue May 2 04:11:00 2017
|
||||
+++ src/lj_arch.h Tue May 2 11:40:27 2017
|
||||
@@ -339,9 +339,6 @@
|
||||
#if defined(_SOFT_FLOAT) || defined(_SOFT_DOUBLE)
|
||||
#error "No support for PowerPC CPUs without double-precision FPU"
|
||||
#endif
|
||||
-#if defined(_LITTLE_ENDIAN)
|
||||
-#error "No support for little-endian PowerPC"
|
||||
-#endif
|
||||
#if defined(_LP64)
|
||||
#error "No support for PowerPC 64 bit mode"
|
||||
$OpenBSD: patch-src_lj_arch_h,v 1.6 2021/07/03 20:21:07 sthen Exp $
|
||||
|
||||
Our base-clang poses as gcc-4.2.1, but building with clang on powerpc
|
||||
"requires" gcc>=4.3, unlike other archs requiring lower versions. Instead,
|
||||
ignore the gcc version check ifdef hell for all base-clang arches.
|
||||
|
||||
Index: src/lj_arch.h
|
||||
--- src/lj_arch.h.orig
|
||||
+++ src/lj_arch.h
|
||||
@@ -299,7 +299,7 @@
|
||||
#endif
|
||||
|
||||
/* Check for minimum required compiler versions. */
|
||||
-#if defined(__GNUC__)
|
||||
+#if defined(__GNUC__) && !defined(__clang__)
|
||||
#if LJ_TARGET_X86
|
||||
#if (__GNUC__ < 3) || ((__GNUC__ == 3) && __GNUC_MINOR__ < 4)
|
||||
#error "Need at least GCC 3.4 or newer"
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user