Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1467798472156900"
MIME-Version: 1.0
Date: Wed, 6 Jul 2016 09:47:52 +0000
From: "Jonathan Perkin" <jperkin@netbsd.org>
Subject: CVS commit: pkgsrc/print/luatex
To: pkgsrc-changes@NetBSD.org
Reply-To: jperkin@netbsd.org
Message-Id: <20160706094753.037E4FBB5@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1467798472156900
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	jperkin
Date:		Wed Jul  6 09:47:52 UTC 2016

Modified Files:
	pkgsrc/print/luatex: Makefile distinfo
Added Files:
	pkgsrc/print/luatex/patches:
	    patch-libs_luajit_LuaJIT-src_src_host_buildvm__asm.c
Removed Files:
	pkgsrc/print/luatex/patches: patch-libs_luajit_Makefile.in

Log Message:
Generate lj_vm_asm.S at build time using a patched generator, should
ensure both SunOS and NetBSD builds are fixed.


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 pkgsrc/print/luatex/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/print/luatex/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/print/luatex/patches/patch-libs_luajit_LuaJIT-src_src_host_buildvm__asm.c
cvs rdiff -u -r1.3 -r0 \
    pkgsrc/print/luatex/patches/patch-libs_luajit_Makefile.in

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


--_----------=_1467798472156900
Content-Disposition: inline
Content-Length: 3622
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/print/luatex/Makefile
diff -u pkgsrc/print/luatex/Makefile:1.49 pkgsrc/print/luatex/Makefile:1.50
--- pkgsrc/print/luatex/Makefile:1.49	Tue Jul  5 01:17:23 2016
+++ pkgsrc/print/luatex/Makefile	Wed Jul  6 09:47:52 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2016/07/05 01:17:23 dholland Exp $
+# $NetBSD: Makefile,v 1.50 2016/07/06 09:47:52 jperkin Exp $
 
 DISTNAME=	texlive-20160523-source
 PKGNAME=	luatex-0.95
@@ -74,6 +74,10 @@ BUILDLINK_API_DEPENDS.kpathsea+= kpathse
 .include "../../print/poppler-includes/buildlink3.mk"
 .include "../../x11/pixman/buildlink3.mk"
 
+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/lua52/libtexlua52.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.21 pkgsrc/print/luatex/distinfo:1.22
--- pkgsrc/print/luatex/distinfo:1.21	Tue Jul  5 12:34:12 2016
+++ pkgsrc/print/luatex/distinfo	Wed Jul  6 09:47:52 2016
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.21 2016/07/05 12:34:12 jperkin Exp $
+$NetBSD: distinfo,v 1.22 2016/07/06 09:47:52 jperkin Exp $
 
 SHA1 (texlive-20160523-source.tar.xz) = 8cdcc00492fc642db59a9a07f9ea080ff6765460
 RMD160 (texlive-20160523-source.tar.xz) = 4ffc4d92f8c6408c23a34815e2d4b0f4877d9c3f
 SHA512 (texlive-20160523-source.tar.xz) = 9fdd69d237238385240e918456f54791a38e57b573edf5df839c57e56a0009012b68b7b92298c3e137181325e2be84d7a84e9c7cf41ae9739bb3329d84194564
 Size (texlive-20160523-source.tar.xz) = 258176464 bytes
 SHA1 (patch-ac) = 1ee83833a03eace2eada892130ddb2198e829f3d
-SHA1 (patch-libs_luajit_Makefile.in) = 830b8a503cf754e1952bb812701296edfb0dedad
+SHA1 (patch-libs_luajit_LuaJIT-src_src_host_buildvm__asm.c) = 34fa742ed696f97df637c5086bf1faf3d718cb69

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.1
--- /dev/null	Wed Jul  6 09:47:52 2016
+++ pkgsrc/print/luatex/patches/patch-libs_luajit_LuaJIT-src_src_host_buildvm__asm.c	Wed Jul  6 09:47:52 2016
@@ -0,0 +1,42 @@
+$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. */


--_----------=_1467798472156900--