parent
acc2273319
commit
08805e977d
@ -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
|
||||
|
30
pkgs/tools/typesetting/tex/texlive/luatex-gcc7.patch
Normal file
30
pkgs/tools/typesetting/tex/texlive/luatex-gcc7.patch
Normal 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(-)
|
||||
|
||||
--- texk/web2c/luatexdir/luaffi/ctype.c
|
||||
+++ 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);
|
||||
|
||||
--- texk/web2c/luatexdir/luaffi/ffi.h
|
||||
+++ 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
|
||||
;
|
Loading…
Reference in New Issue
Block a user