Re: CVS commit: pkgsrc/print/luatex

[Thomas Klausner <wiz%NetBSD.org@localhost>]

On NetBSD-current, I now see
libtool: link: gcc -shared  -fPIC -DPIC  .libs/lbitlib.o .libs/lib_base.o .libs/lib_math.o .libs/lib_bit.o .libs/lib_string.o .libs/lib_table.o .libs/lib_io.o .libs/lib_os.o .libs/lib_package.o 
.libs/lib_debug.o .libs/lib_jit.o .libs/lib_ffi.o LuaJIT-src/src/.libs/lib_aux.o LuaJIT-src/src/.libs/lib_init.o LuaJIT-src/src/.libs/lj_alloc.o LuaJIT-src/src/.libs/lj_api.o 
LuaJIT-src/src/.libs/lj_asm.o LuaJIT-src/src/.libs/lj_bc.o LuaJIT-src/src/.libs/lj_bcread.o LuaJIT-src/src/.libs/lj_bcwrite.o LuaJIT-src/src/.libs/lj_buf.o LuaJIT-src/src/.libs/lj_carith.o 
LuaJIT-src/src/.libs/lj_ccall.o LuaJIT-src/src/.libs/lj_ccallback.o LuaJIT-src/src/.libs/lj_cconv.o LuaJIT-src/src/.libs/lj_cdata.o LuaJIT-src/src/.libs/lj_char.o LuaJIT-src/src/.libs/lj_clib.o 
LuaJIT-src/src/.libs/lj_cparse.o LuaJIT-src/src/.libs/lj_crecord.o LuaJIT-src/src/.libs/lj_ctype.o LuaJIT-src/src/.libs/lj_debug.o LuaJIT-src/src/.libs/lj_dispatch.o LuaJIT-src/src/.libs/lj_err.o 
LuaJIT-src/src/.libs/lj_ffrecord.o LuaJIT-src/src/.libs/lj_func.o LuaJIT-src/src/.libs/lj_gc.o LuaJIT-src/src/.libs/lj_gdbjit.o LuaJIT-src/src/.libs/lj_ir.o LuaJIT-src/src/.libs/lj_lex.o 
LuaJIT-src/src/.libs/lj_lib.o LuaJIT-src/src/.libs/lj_load.o LuaJIT-src/src/.libs/lj_mcode.o LuaJIT-src/src/.libs/lj_meta.o LuaJIT-src/src/.libs/lj_obj.o LuaJIT-src/src/.libs/lj_opt_dce.o 
LuaJIT-src/src/.libs/lj_opt_fold.o LuaJIT-src/src/.libs/lj_opt_loop.o LuaJIT-src/src/.libs/lj_opt_mem.o LuaJIT-src/src/.libs/lj_opt_narrow.o LuaJIT-src/src/.libs/lj_opt_sink.o 
LuaJIT-src/src/.libs/lj_opt_split.o LuaJIT-src/src/.libs/lj_parse.o LuaJIT-src/src/.libs/lj_profile.o LuaJIT-src/src/.libs/lj_record.o LuaJIT-src/src/.libs/lj_snap.o LuaJIT-src/src/.libs/lj_state.o 
LuaJIT-src/src/.libs/lj_str.o LuaJIT-src/src/.libs/lj_strfmt.o LuaJIT-src/src/.libs/lj_strfmt_num.o LuaJIT-src/src/.libs/lj_strscan.o LuaJIT-src/src/.libs/lj_tab.o LuaJIT-src/src/.libs/lj_trace.o 
LuaJIT-src/src/.libs/lj_udata.o LuaJIT-src/src/.libs/lj_vmevent.o LuaJIT-src/src/.libs/lj_vmmath.o .libs/lj_vm_asm.o   -L/scratch/print/luatex/work/.buildlink/lib -lm  -O2 -Wl,-z -Wl,relro -Wl,-z 
-Wl,now -Wl,-rpath -Wl,/usr/pkg/lib   -Wl,-soname -Wl,libtexluajit.so.2 -o .libs/libtexluajit.so.2.1.0
ld: .eh_frame_hdr refers to overlapping FDEs.
ld: final link failed: Bad value

Removing the patch completely works around this. Please fix this.

Thanks,
 Thomas

On Tue, Jul 05, 2016 at 12:34:12PM +0000, Jonathan Perkin wrote:
> Module Name:  pkgsrc
> Committed By: jperkin
> Date:         Tue Jul  5 12:34:12 UTC 2016
> 
> Modified Files:
>       pkgsrc/print/luatex: distinfo
>       pkgsrc/print/luatex/patches: patch-libs_luajit_Makefile.in
> 
> Log Message:
> Fully fix the SunOS PLT issue.
> 
> 
> To generate a diff of this commit:
> cvs rdiff -u -r1.20 -r1.21 pkgsrc/print/luatex/distinfo
> cvs rdiff -u -r1.2 -r1.3 \
>     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.
> 

> Modified files:
> 
> Index: pkgsrc/print/luatex/distinfo
> diff -u pkgsrc/print/luatex/distinfo:1.20 pkgsrc/print/luatex/distinfo:1.21
> --- pkgsrc/print/luatex/distinfo:1.20 Tue Jul  5 01:17:23 2016
> +++ pkgsrc/print/luatex/distinfo      Tue Jul  5 12:34:12 2016
> @@ -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
> 
> Index: pkgsrc/print/luatex/patches/patch-libs_luajit_Makefile.in
> diff -u pkgsrc/print/luatex/patches/patch-libs_luajit_Makefile.in:1.2 pkgsrc/print/luatex/patches/patch-libs_luajit_Makefile.in:1.3
> --- pkgsrc/print/luatex/patches/patch-libs_luajit_Makefile.in:1.2     Tue Jul  5 01:17:23 2016
> +++ pkgsrc/print/luatex/patches/patch-libs_luajit_Makefile.in Tue Jul  5 12:34:12 2016
> @@ -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 >$@ \
>