diff options
author | markd <markd> | 2016-07-03 11:19:50 +0000 |
---|---|---|
committer | markd <markd> | 2016-07-03 11:19:50 +0000 |
commit | 77667d2082fb639ffa24616d89cc7743cf653fbe (patch) | |
tree | dba9dd34ebdf37ce80d3a2d60b005d31fe5cdefc /print/luatex | |
parent | 4f46dfed0e61ab80ea9528539afe51c2f880a634 (diff) | |
download | pkgsrc-77667d2082fb639ffa24616d89cc7743cf653fbe.tar.gz |
workaround for luajit PIC issue PR pkg/51304 (also PR pkg/51260)
Diffstat (limited to 'print/luatex')
-rw-r--r-- | print/luatex/Makefile | 5 | ||||
-rw-r--r-- | print/luatex/distinfo | 3 | ||||
-rw-r--r-- | print/luatex/patches/patch-libs_luajit_Makefile.in | 16 |
3 files changed, 21 insertions, 3 deletions
diff --git a/print/luatex/Makefile b/print/luatex/Makefile index 52b0abb6683..ef11aa2e9fe 100644 --- a/print/luatex/Makefile +++ b/print/luatex/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.47 2016/06/16 04:06:19 markd Exp $ +# $NetBSD: Makefile,v 1.48 2016/07/03 11:19:50 markd Exp $ DISTNAME= texlive-20160523-source PKGNAME= luatex-0.95 +PKGREVISION= 1 CATEGORIES= print MASTER_SITES= ftp://tug.org/historic/systems/texlive/2016/ EXTRACT_SUFX= .tar.xz @@ -19,7 +20,7 @@ EXTRACT_ELEMENTS= ${DISTNAME}/build-aux \ GNU_CONFIGURE= yes USE_LANGUAGES= c c++ USE_LIBTOOL= yes -USE_TOOLS+= gmake lex perl pkg-config yacc +USE_TOOLS+= gmake gsed lex perl pkg-config yacc CONFIGURE_ARGS+= --disable-aleph --disable-etex --disable-pdftex \ --enable-luatex --disable-mf --disable-mf-nowin \ --with-x=no \ diff --git a/print/luatex/distinfo b/print/luatex/distinfo index ca745114d7b..c6d1f1d43a4 100644 --- a/print/luatex/distinfo +++ b/print/luatex/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.18 2016/06/16 04:06:19 markd Exp $ +$NetBSD: distinfo,v 1.19 2016/07/03 11:19:50 markd 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) = 9d1120c3a27b5668c027b236cae7df3bf76585b5 diff --git a/print/luatex/patches/patch-libs_luajit_Makefile.in b/print/luatex/patches/patch-libs_luajit_Makefile.in new file mode 100644 index 00000000000..0fa1f10ddbb --- /dev/null +++ b/print/luatex/patches/patch-libs_luajit_Makefile.in @@ -0,0 +1,16 @@ +$NetBSD: patch-libs_luajit_Makefile.in,v 1.1 2016/07/03 11:19:51 markd 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 +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,7 @@ 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 $@ ++ test lj_vm_asm.S && $(SED) -i.orig 's/\(call lj_.*\)$$/\1@PLT/' lj_vm_asm.S + + lj_vm_obj.lo: lj_vm_obj.o lib_base.lo + $(AM_V_GEN)sed 's/lib_base/lj_vm_obj/' lib_base.lo >$@ \ |