CVS commit: pkgsrc/print/luatex

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

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed May 13 11:14:21 UTC 2020

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

Log Message:
luatex: Fix SunOS build.


To generate a diff of this commit:
cvs rdiff -u -r1.95 -r1.96 pkgsrc/print/luatex/Makefile
cvs rdiff -u -r1.37 -r1.38 pkgsrc/print/luatex/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    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.95 pkgsrc/print/luatex/Makefile:1.96
--- pkgsrc/print/luatex/Makefile:1.95   Sun May 10 03:56:39 2020
+++ pkgsrc/print/luatex/Makefile        Wed May 13 11:14:21 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.95 2020/05/10 03:56:39 markd Exp $
+# $NetBSD: Makefile,v 1.96 2020/05/13 11:14:21 jperkin Exp $
 
 .include "../../print/texlive/Makefile.common"
 
@@ -73,10 +73,6 @@ CHECK_PORTABILITY_SKIP+=     libs/luajit/Mak
 
 CPPFLAGS.SunOS+=       -D_XOPEN_SOURCE_EXTENDED=0
 
-pre-configure:
-       # Ensure we generate our patched version
-       ${RM} -f libs/luajit/lj_vm_asm.S
-
 do-install:
        ${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/libs/lua53/libtexlua53.la ${DESTDIR}${PREFIX}/lib
        ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/texk/web2c/luatex ${DESTDIR}${PREFIX}/bin

Index: pkgsrc/print/luatex/distinfo
diff -u pkgsrc/print/luatex/distinfo:1.37 pkgsrc/print/luatex/distinfo:1.38
--- pkgsrc/print/luatex/distinfo:1.37   Sun May 10 03:56:39 2020
+++ pkgsrc/print/luatex/distinfo        Wed May 13 11:14:21 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.37 2020/05/10 03:56:39 markd Exp $
+$NetBSD: distinfo,v 1.38 2020/05/13 11:14:21 jperkin Exp $
 
 SHA1 (texlive-20200406-source.tar.xz) = 94b77331474d678ce75d9d6c673965fd7f93295b
 RMD160 (texlive-20200406-source.tar.xz) = 7475f64f21c7ba7a2e7c6e9bfe534dd6d53e4bb9
@@ -6,5 +6,5 @@ SHA512 (texlive-20200406-source.tar.xz) 
 Size (texlive-20200406-source.tar.xz) = 55383320 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) = 491d33adbbaab8b2b81a65a8d7ba30aee775b75f
+SHA1 (patch-libs_luajit_LuaJIT-src_src_vm__x86.dasc) = 9bbd384d56ab25c4c2a2dc3cd7e282da7d3ad935
 SHA1 (patch-libs_luajit_Makefile.in) = 810cac28910bf1887828ea29140759747e5a043e

Index: pkgsrc/print/luatex/patches/patch-libs_luajit_LuaJIT-src_src_vm__x86.dasc
diff -u pkgsrc/print/luatex/patches/patch-libs_luajit_LuaJIT-src_src_vm__x86.dasc:1.1 pkgsrc/print/luatex/patches/patch-libs_luajit_LuaJIT-src_src_vm__x86.dasc:1.2
--- pkgsrc/print/luatex/patches/patch-libs_luajit_LuaJIT-src_src_vm__x86.dasc:1.1       Thu Jul  7 11:10:05 2016
+++ pkgsrc/print/luatex/patches/patch-libs_luajit_LuaJIT-src_src_vm__x86.dasc   Wed May 13 11:14:21 2020
@@ -1,4 +1,4 @@
-$NetBSD: patch-libs_luajit_LuaJIT-src_src_vm__x86.dasc,v 1.1 2016/07/07 11:10:05 jperkin Exp $
+$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.
 
@@ -9,7 +9,7 @@ Generate SunOS compatible assembly.
        "\t.uleb128 6\n"                        /* augmentation length */
        "\t.byte 0x1b\n"                        /* pcrel|sdata4 */
 +#ifdef __sun
-+      "\t.long lj_err_unwind_dwarf@PLT-.\n"
++      "\t.long lj_err_unwind_dwarf@PLT\n"
 +#else
        "\t.long lj_err_unwind_dwarf-.\n"
 +#endif