CVS commit: pkgsrc/print/luatex

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon Jun 10 09:27:15 UTC 2024

Modified Files:
        pkgsrc/print/luatex: Makefile distinfo
Added Files:
        pkgsrc/print/luatex/patches:
            patch-libs_luajit_LuaJIT-src_src_host_buildvm__asm.c
            patch-libs_luajit_LuaJIT-src_src_vm__x86.dasc

Log Message:
luatex: Restore SunOS patches that were inexplicably deleted.


To generate a diff of this commit:
cvs rdiff -u -r1.117 -r1.118 pkgsrc/print/luatex/Makefile
cvs rdiff -u -r1.47 -r1.48 pkgsrc/print/luatex/distinfo
cvs rdiff -u -r0 -r1.3 \
    pkgsrc/print/luatex/patches/patch-libs_luajit_LuaJIT-src_src_host_buildvm__asm.c
cvs rdiff -u -r0 -r1.4 \
    pkgsrc/print/luatex/patches/patch-libs_luajit_LuaJIT-src_src_vm__x86.dasc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/print/luatex/Makefile
diff -u pkgsrc/print/luatex/Makefile:1.117 pkgsrc/print/luatex/Makefile:1.118
--- pkgsrc/print/luatex/Makefile:1.117  Sun Apr  7 07:34:53 2024
+++ pkgsrc/print/luatex/Makefile        Mon Jun 10 09:27:15 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.117 2024/04/07 07:34:53 wiz Exp $
+# $NetBSD: Makefile,v 1.118 2024/06/10 09:27:15 jperkin Exp $
 
 PKGREVISION= 1
 .include "../../print/texlive/Makefile.common"
@@ -11,6 +11,7 @@ COMMENT=      Extended version of pdfTeX usin
 LICENSE=       gnu-gpl-v2
 
 EXTRACT_ELEMENTS+=     ${DISTNAME}/libs/lua53
+EXTRACT_ELEMENTS+=     ${DISTNAME}/libs/luajit
 EXTRACT_ELEMENTS+=     ${DISTNAME}/libs/potrace
 EXTRACT_ELEMENTS+=     ${DISTNAME}/libs/pplib
 EXTRACT_ELEMENTS+=     ${DISTNAME}/texk/web2c

Index: pkgsrc/print/luatex/distinfo
diff -u pkgsrc/print/luatex/distinfo:1.47 pkgsrc/print/luatex/distinfo:1.48
--- pkgsrc/print/luatex/distinfo:1.47   Thu Mar 21 08:27:03 2024
+++ pkgsrc/print/luatex/distinfo        Mon Jun 10 09:27:15 2024
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.47 2024/03/21 08:27:03 markd Exp $
+$NetBSD: distinfo,v 1.48 2024/06/10 09:27:15 jperkin Exp $
 
 BLAKE2s (texlive-20240312-source.tar.xz) = 72bccd07a7c210c1c5e3d86d72f3e86bfaf7c2922345f2e048c6336b2a1bd11b
 SHA512 (texlive-20240312-source.tar.xz) = e7ed4eb419da789f82d4295819ba72d10766398fd20c8675742fcec985851917b2005d259e4c9bb952790472855115644297d92257878882a66315cc940b9210
 Size (texlive-20240312-source.tar.xz) = 70140588 bytes
 SHA1 (patch-libs_lua53_lua53-src_src_luaconf.h) = 824ee4ba2c324e1e01967b82a54621b6b6f3edd3
+SHA1 (patch-libs_luajit_LuaJIT-src_src_host_buildvm__asm.c) = c2e392935968a6749aef643be6703535cc56be16
+SHA1 (patch-libs_luajit_LuaJIT-src_src_vm__x86.dasc) = cb74b231f19f6faeee7a9d8cc6076f6f4f360472
 SHA1 (patch-texk_web2c_configure) = 474ea4f57d535e22355916d6d52d4490d1138cfe

Added files:

Index: pkgsrc/print/luatex/patches/patch-libs_luajit_LuaJIT-src_src_host_buildvm__asm.c
diff -u /dev/null pkgsrc/print/luatex/patches/patch-libs_luajit_LuaJIT-src_src_host_buildvm__asm.c:1.3
--- /dev/null   Mon Jun 10 09:27:15 2024
+++ pkgsrc/print/luatex/patches/patch-libs_luajit_LuaJIT-src_src_host_buildvm__asm.c    Mon Jun 10 09:27:15 2024
@@ -0,0 +1,42 @@
+$NetBSD: patch-libs_luajit_LuaJIT-src_src_host_buildvm__asm.c,v 1.3 2024/06/10 09:27:15 jperkin Exp $
+
+Generate SunOS compatible assembly.
+
+--- libs/luajit/LuaJIT-src/src/host/buildvm_asm.c.orig 2024-06-10 08:53:56.927972792 +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. */

Index: pkgsrc/print/luatex/patches/patch-libs_luajit_LuaJIT-src_src_vm__x86.dasc
diff -u /dev/null pkgsrc/print/luatex/patches/patch-libs_luajit_LuaJIT-src_src_vm__x86.dasc:1.4
--- /dev/null   Mon Jun 10 09:27:15 2024
+++ pkgsrc/print/luatex/patches/patch-libs_luajit_LuaJIT-src_src_vm__x86.dasc   Mon Jun 10 09:27:15 2024
@@ -0,0 +1,18 @@
+$NetBSD: patch-libs_luajit_LuaJIT-src_src_vm__x86.dasc,v 1.4 2024/06/10 09:27:15 jperkin Exp $
+
+Generate SunOS compatible assembly.
+
+--- libs/luajit/LuaJIT-src/src/vm_x86.dasc.orig        2018-01-09 23:43:20.000000000 +0000
++++ libs/luajit/LuaJIT-src/src/vm_x86.dasc
+@@ -5569,7 +5569,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"