luatex: do not ./configure in internal copy of luajit

this is not used, rather it seems to use an internal copy of lua 5.3
instead. while it would be nice if it used our copy instead, for now
removing the luajit requirement at least improves portability.

5 files changed, 2 insertions, 85 deletions

diff --git a/print/luatex/Makefile b/print/luatex/Makefile
index 65b838409b6..2001ffdc6b1 100644
--- a/print/luatex/Makefile
+++ b/print/luatex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.106 2021/06/06 01:17:19 markd Exp $
+# $NetBSD: Makefile,v 1.107 2021/06/13 07:27:42 nia Exp $
 
 .include "../../print/texlive/Makefile.common"
 
@@ -10,7 +10,6 @@ COMMENT=	Extended version of pdfTeX using Lua
 LICENSE=	gnu-gpl-v2
 
 EXTRACT_ELEMENTS+=	${DISTNAME}/libs/lua53
-EXTRACT_ELEMENTS+=	${DISTNAME}/libs/luajit
 EXTRACT_ELEMENTS+=	${DISTNAME}/libs/pplib
 EXTRACT_ELEMENTS+=	${DISTNAME}/texk/web2c
 
@@ -58,7 +57,6 @@ CONFIGURE_ARGS+=	--with-gmp-libdir=${BUILDLINK_PREFIX.gmp}/lib
 CONFIGURE_ARGS+=	--without-x
 
 CONFIGURE_DIRS=		libs/lua53
-CONFIGURE_DIRS+=	libs/luajit
 CONFIGURE_DIRS+=	libs/pplib
 CONFIGURE_DIRS+=	texk/web2c
 
@@ -69,9 +67,6 @@ SUBST_STAGE.prefix=	post-configure
 SUBST_FILES.prefix=	libs/lua53/lua53-src/src/luaconf.h
 SUBST_VARS.prefix=	PREFIX
 
-# patched in Makefile.in
-CHECK_PORTABILITY_SKIP+=	libs/luajit/Makefile.am
-
 CPPFLAGS.SunOS+=	-D_XOPEN_SOURCE_EXTENDED=0
 
 do-install:
diff --git a/print/luatex/distinfo b/print/luatex/distinfo
index 62d1ef0ddb7..c0292f5607e 100644
--- a/print/luatex/distinfo
+++ b/print/luatex/distinfo
@@ -1,10 +1,7 @@
-$NetBSD: distinfo,v 1.39 2021/06/06 01:17:19 markd Exp $
+$NetBSD: distinfo,v 1.40 2021/06/13 07:27:42 nia Exp $
 
 SHA1 (texlive-20210325-source.tar.xz) = fa68012b86e20410c90684ec2ff50e34023bbaf2
 RMD160 (texlive-20210325-source.tar.xz) = 90f924b7843de99c9b438d66926192020291bbee
 SHA512 (texlive-20210325-source.tar.xz) = afd6eb24efaeac7c58d43ff24162aece919079a9ae02934509f068c7a3828223c33c14d9db11ff7fea3560b08a06f352446ba7f845eefb4a56a87b96f088f213
 Size (texlive-20210325-source.tar.xz) = 54837368 bytes
 SHA1 (patch-libs_lua53_lua53-src_src_luaconf.h) = 824ee4ba2c324e1e01967b82a54621b6b6f3edd3
-SHA1 (patch-libs_luajit_LuaJIT-src_src_host_buildvm__asm.c) = 34fa742ed696f97df637c5086bf1faf3d718cb69
-SHA1 (patch-libs_luajit_LuaJIT-src_src_vm__x86.dasc) = 9bbd384d56ab25c4c2a2dc3cd7e282da7d3ad935
-SHA1 (patch-libs_luajit_Makefile.in) = 810cac28910bf1887828ea29140759747e5a043e
diff --git a/print/luatex/patches/patch-libs_luajit_LuaJIT-src_src_host_buildvm__asm.c b/print/luatex/patches/patch-libs_luajit_LuaJIT-src_src_host_buildvm__asm.c
deleted file mode 100644
index 59207f22dc9..00000000000
--- a/print/luatex/patches/patch-libs_luajit_LuaJIT-src_src_host_buildvm__asm.c
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-libs_luajit_LuaJIT-src_src_host_buildvm__asm.c,v 1.1 2016/07/06 09:47:52 jperkin Exp $
-
-Generate SunOS compatible assembly.
-
---- libs/luajit/LuaJIT-src/src/host/buildvm_asm.c.orig	2016-03-09 22:32:00.000000000 +0000
-+++ libs/luajit/LuaJIT-src/src/host/buildvm_asm.c
-@@ -29,7 +29,11 @@ static void emit_asm_reloc(BuildCtx *ctx
-   switch (ctx->mode) {
-   case BUILD_elfasm:
-     if (type)
-+#ifdef __sun
-+      fprintf(ctx->fp, "\t.long %s@PLT-.-4\n", sym);
-+#else
-       fprintf(ctx->fp, "\t.long %s-.-4\n", sym);
-+#endif
-     else
-       fprintf(ctx->fp, "\t.long %s\n", sym);
-     break;
-@@ -75,7 +79,11 @@ err:
-     /* Various fixups for external symbols outside of our binary. */
-     if (ctx->mode == BUILD_elfasm) {
-       if (LJ_32)
-+#ifdef __sun
-+	fprintf(ctx->fp, "#if __PIC__\n\t%s lj_wrap_%s@PLT\n#else\n", opname, sym);
-+#else
- 	fprintf(ctx->fp, "#if __PIC__\n\t%s lj_wrap_%s\n#else\n", opname, sym);
-+#endif
-       fprintf(ctx->fp, "\t%s %s@PLT\n", opname, sym);
-       if (LJ_32)
- 	fprintf(ctx->fp, "#endif\n");
-@@ -85,7 +93,11 @@ err:
-       return;
-     }
-   }
-+#ifdef __sun
-+  fprintf(ctx->fp, "\t%s %s@PLT\n", opname, sym);
-+#else
-   fprintf(ctx->fp, "\t%s %s\n", opname, sym);
-+#endif
- }
- #else
- /* Emit words piecewise as assembler text. */
diff --git a/print/luatex/patches/patch-libs_luajit_LuaJIT-src_src_vm__x86.dasc b/print/luatex/patches/patch-libs_luajit_LuaJIT-src_src_vm__x86.dasc
deleted file mode 100644
index df03da82a58..00000000000
--- a/print/luatex/patches/patch-libs_luajit_LuaJIT-src_src_vm__x86.dasc
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-libs_luajit_LuaJIT-src_src_vm__x86.dasc,v 1.2 2020/05/13 11:14:21 jperkin Exp $
-
-Generate SunOS compatible assembly.
-
---- libs/luajit/LuaJIT-src/src/vm_x86.dasc.orig	2016-03-09 22:32:00.000000000 +0000
-+++ libs/luajit/LuaJIT-src/src/vm_x86.dasc
-@@ -5496,7 +5496,11 @@ static void emit_asm_debug(BuildCtx *ctx
- 	"\t.byte " REG_RA "\n"
- 	"\t.uleb128 6\n"			/* augmentation length */
- 	"\t.byte 0x1b\n"			/* pcrel|sdata4 */
-+#ifdef __sun
-+	"\t.long lj_err_unwind_dwarf@PLT\n"
-+#else
- 	"\t.long lj_err_unwind_dwarf-.\n"
-+#endif
- 	"\t.byte 0x1b\n"			/* pcrel|sdata4 */
- 	"\t.byte 0xc\n\t.uleb128 " REG_SP "\n\t.uleb128 " SZPTR "\n"
- 	"\t.byte 0x80+" REG_RA "\n\t.uleb128 0x1\n"
diff --git a/print/luatex/patches/patch-libs_luajit_Makefile.in b/print/luatex/patches/patch-libs_luajit_Makefile.in
deleted file mode 100644
index 9eb36c852c3..00000000000
--- a/print/luatex/patches/patch-libs_luajit_Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-libs_luajit_Makefile.in,v 1.5 2020/03/12 17:18:30 wiz Exp $
-
-Fix unportable test(1) operator.
-
---- libs/luajit/Makefile.in.orig	2018-05-14 18:07:32.000000000 +0000
-+++ libs/luajit/Makefile.in
-@@ -2039,7 +2039,7 @@ lj_vm_obj.o lj_vm_asm.S: native/buildvm-
- 
- lj_vm_obj.lo: lj_vm_obj.o lib_base.lo
- 	$(AM_V_GEN)sed 's/lib_base/lj_vm_obj/' lib_base.lo >$@ \
--	  && . ./$@ && test x"$$pic_object" == xnone \
-+	  && . ./$@ && test x"$$pic_object" = xnone \
- 	  || cp lj_vm_obj.o .libs/lj_vm_obj.o
- 
- $(ljlib_sources) lj_opt_fold.c: config.force