Merge pull request #35887 from dtzWill/fix/luatex-issue-35839

luatex: patch to fix crash w/gcc7
This commit is contained in:
Will Dietz 2018-02-27 11:39:18 -06:00 committed by GitHub
commit c9cf193f0e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 0 deletions

View file

@ -168,6 +168,8 @@ core-big = stdenv.mkDerivation { #TODO: upmendex
# http://tex.stackexchange.com/questions/97999/when-to-use-luajittex-in-favour-of-luatex
];
patches = [ ./luatex-gcc7.patch ];
configureScript = ":";
# we use static libtexlua, because it's only used by a single binary

View file

@ -0,0 +1,30 @@
https://www.tug.org/pipermail/tex-live/2017-June/040192.html
---
texk/web2c/luatexdir/luaffi/ctype.c | 4 ++++
texk/web2c/luatexdir/luaffi/ffi.h | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
--- a/texk/web2c/luatexdir/luaffi/ctype.c
+++ b/texk/web2c/luatexdir/luaffi/ctype.c 2017-05-31 13:08:25.421741873 +0000
@@ -245,6 +245,10 @@ void* to_cdata(lua_State* L, int idx, st
lua_pop(L, 1); /* mt */
cd = (struct cdata*) lua_touserdata(L, idx);
+ if (!cd) {
+ lua_pushnil(L);
+ return NULL;
+ }
*ct = cd->type;
lua_getuservalue(L, idx);
--- a/texk/web2c/luatexdir/luaffi/ffi.h
+++ b/texk/web2c/luatexdir/luaffi/ffi.h 2017-06-01 09:12:45.128442092 +0000
@@ -370,7 +370,7 @@ __declspec(align(16))
#endif
struct cdata {
const struct ctype type
-#ifdef __GNUC__
+#if 0 /* def __GNUC__ */
__attribute__ ((aligned(16)))
#endif
;