Tue Jul 5 12:34:12 2016 UTC ()
Fully fix the SunOS PLT issue.


(jperkin)
diff -r1.20 -r1.21 pkgsrc/print/luatex/distinfo
diff -r1.2 -r1.3 pkgsrc/print/luatex/patches/patch-libs_luajit_Makefile.in
cvs diff -r1.20 -r1.21 pkgsrc/print/luatex/distinfo (expand / switch to unified diff)

--- pkgsrc/print/luatex/distinfo 2016/07/05 01:17:23 1.20
+++ pkgsrc/print/luatex/distinfo 2016/07/05 12:34:12 1.21
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.20 2016/07/05 01:17:23 dholland Exp $ 1$NetBSD: distinfo,v 1.21 2016/07/05 12:34:12 jperkin Exp $
2 2
3SHA1 (texlive-20160523-source.tar.xz) = 8cdcc00492fc642db59a9a07f9ea080ff6765460 3SHA1 (texlive-20160523-source.tar.xz) = 8cdcc00492fc642db59a9a07f9ea080ff6765460
4RMD160 (texlive-20160523-source.tar.xz) = 4ffc4d92f8c6408c23a34815e2d4b0f4877d9c3f 4RMD160 (texlive-20160523-source.tar.xz) = 4ffc4d92f8c6408c23a34815e2d4b0f4877d9c3f
5SHA512 (texlive-20160523-source.tar.xz) = 9fdd69d237238385240e918456f54791a38e57b573edf5df839c57e56a0009012b68b7b92298c3e137181325e2be84d7a84e9c7cf41ae9739bb3329d84194564 5SHA512 (texlive-20160523-source.tar.xz) = 9fdd69d237238385240e918456f54791a38e57b573edf5df839c57e56a0009012b68b7b92298c3e137181325e2be84d7a84e9c7cf41ae9739bb3329d84194564
6Size (texlive-20160523-source.tar.xz) = 258176464 bytes 6Size (texlive-20160523-source.tar.xz) = 258176464 bytes
7SHA1 (patch-ac) = 1ee83833a03eace2eada892130ddb2198e829f3d 7SHA1 (patch-ac) = 1ee83833a03eace2eada892130ddb2198e829f3d
8SHA1 (patch-libs_luajit_Makefile.in) = 2a125881a2fac96c06561274610854406df967a7 8SHA1 (patch-libs_luajit_Makefile.in) = 830b8a503cf754e1952bb812701296edfb0dedad
cvs diff -r1.2 -r1.3 pkgsrc/print/luatex/patches/patch-libs_luajit_Makefile.in (expand / switch to unified diff)

--- pkgsrc/print/luatex/patches/patch-libs_luajit_Makefile.in 2016/07/05 01:17:23 1.2
+++ pkgsrc/print/luatex/patches/patch-libs_luajit_Makefile.in 2016/07/05 12:34:12 1.3
@@ -1,17 +1,20 @@ @@ -1,17 +1,20 @@
1$NetBSD: patch-libs_luajit_Makefile.in,v 1.2 2016/07/05 01:17:23 dholland Exp $ 1$NetBSD: patch-libs_luajit_Makefile.in,v 1.3 2016/07/05 12:34:12 jperkin Exp $
2 2
3Ensure that the luajit generated asm file is PIC for libtool use, particularly 3Ensure that the luajit generated asm file is PIC for libtool use, particularly
4important when linking under SunOS... appending @PLT seems to workaround the 4important when linking under SunOS... appending @PLT seems to workaround the
5issue with generated PC relative calls. 5issue with generated PC relative calls.
6 6
7--- libs/luajit/Makefile.in.orig 2016-03-21 20:23:37.000000000 +0000 7--- libs/luajit/Makefile.in.orig 2016-03-21 20:23:37.000000000 +0000
8+++ libs/luajit/Makefile.in 8+++ libs/luajit/Makefile.in
9@@ -1827,6 +1827,8 @@ lj_folddef.h: native/buildvm-stamp 9@@ -1827,6 +1827,11 @@ lj_folddef.h: native/buildvm-stamp
10  10
11 lj_vm_obj.o lj_vm_asm.S: native/buildvm-stamp 11 lj_vm_obj.o lj_vm_asm.S: native/buildvm-stamp
12 $(AM_V_GEN)native/buildvm -m $(LJVM_MODE) -o $@ 12 $(AM_V_GEN)native/buildvm -m $(LJVM_MODE) -o $@
13+ mv -f lj_vm_asm.S lj_vm_asm.S.orig 13+ mv -f lj_vm_asm.S lj_vm_asm.S.orig
14+ $(SED) < lj_vm_asm.S.orig > lj_vm_asm.S -e 's/\(call lj_.*\)$$/\1@PLT/' 14+ $(SED) < lj_vm_asm.S.orig > lj_vm_asm.S \
 15+ -e 's/\(call lj_.*\)$$/\1@PLT/' \
 16+ -e 's/\(jmp lj_.*\)$$/\1@PLT/' \
 17+ -e 's/\(long lj_.*\)-/\1@PLT-/'
15  18
16 lj_vm_obj.lo: lj_vm_obj.o lib_base.lo 19 lj_vm_obj.lo: lj_vm_obj.o lib_base.lo
17 $(AM_V_GEN)sed 's/lib_base/lj_vm_obj/' lib_base.lo >$@ \ 20 $(AM_V_GEN)sed 's/lib_base/lj_vm_obj/' lib_base.lo >$@ \