summaryrefslogtreecommitdiff
path: root/print
diff options
context:
space:
mode:
authorjperkin <jperkin>2016-07-05 12:34:12 +0000
committerjperkin <jperkin>2016-07-05 12:34:12 +0000
commit170ba1e628afa0b95497f10ecc6f89333d925aab (patch)
tree15431256b8f279aa1a4266dc5a512423df67793c /print
parent434fdef7337d9762acd91dd6cbcc5ae7a1ba8376 (diff)
downloadpkgsrc-170ba1e628afa0b95497f10ecc6f89333d925aab.tar.gz
Fully fix the SunOS PLT issue.
Diffstat (limited to 'print')
-rw-r--r--print/luatex/distinfo4
-rw-r--r--print/luatex/patches/patch-libs_luajit_Makefile.in9
2 files changed, 8 insertions, 5 deletions
diff --git a/print/luatex/distinfo b/print/luatex/distinfo
index 49853b850a9..9b05ec27cd1 100644
--- a/print/luatex/distinfo
+++ b/print/luatex/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.20 2016/07/05 01:17:23 dholland Exp $
+$NetBSD: distinfo,v 1.21 2016/07/05 12:34:12 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) = 2a125881a2fac96c06561274610854406df967a7
+SHA1 (patch-libs_luajit_Makefile.in) = 830b8a503cf754e1952bb812701296edfb0dedad
diff --git a/print/luatex/patches/patch-libs_luajit_Makefile.in b/print/luatex/patches/patch-libs_luajit_Makefile.in
index 33e7ab2872b..a92c936698b 100644
--- a/print/luatex/patches/patch-libs_luajit_Makefile.in
+++ b/print/luatex/patches/patch-libs_luajit_Makefile.in
@@ -1,4 +1,4 @@
-$NetBSD: patch-libs_luajit_Makefile.in,v 1.2 2016/07/05 01:17:23 dholland Exp $
+$NetBSD: patch-libs_luajit_Makefile.in,v 1.3 2016/07/05 12:34:12 jperkin Exp $
Ensure that the luajit generated asm file is PIC for libtool use, particularly
important when linking under SunOS... appending @PLT seems to workaround the
@@ -6,12 +6,15 @@ issue with generated PC relative calls.
--- libs/luajit/Makefile.in.orig 2016-03-21 20:23:37.000000000 +0000
+++ libs/luajit/Makefile.in
-@@ -1827,6 +1827,8 @@ lj_folddef.h: native/buildvm-stamp
+@@ -1827,6 +1827,11 @@ lj_folddef.h: native/buildvm-stamp
lj_vm_obj.o lj_vm_asm.S: native/buildvm-stamp
$(AM_V_GEN)native/buildvm -m $(LJVM_MODE) -o $@
+ mv -f lj_vm_asm.S lj_vm_asm.S.orig
-+ $(SED) < lj_vm_asm.S.orig > lj_vm_asm.S -e 's/\(call lj_.*\)$$/\1@PLT/'
++ $(SED) < lj_vm_asm.S.orig > lj_vm_asm.S \
++ -e 's/\(call lj_.*\)$$/\1@PLT/' \
++ -e 's/\(jmp lj_.*\)$$/\1@PLT/' \
++ -e 's/\(long lj_.*\)-/\1@PLT-/'
lj_vm_obj.lo: lj_vm_obj.o lib_base.lo
$(AM_V_GEN)sed 's/lib_base/lj_vm_obj/' lib_base.lo >$@ \