diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2017-06-09 12:53:27 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2017-06-09 12:53:27 +0000 |
| commit | f479d7196143cd38e09398077ab4996b783122f7 (patch) | |
| tree | e4c6c4f2f8878427a75a67e63247a4767bc1e769 | |
| parent | binutils-2.28: Update to patchset 1.2 (diff) | |
| download | gentoo-f479d7196143cd38e09398077ab4996b783122f7.tar.gz gentoo-f479d7196143cd38e09398077ab4996b783122f7.tar.bz2 gentoo-f479d7196143cd38e09398077ab4996b783122f7.zip | |
add gcc7 fix
| -rw-r--r-- | src/patchsets/texlive/2017/texlive-core/070_all_luatex_ggc7_align.patch | 36 | ||||
| -rw-r--r-- | src/patchsets/texlive/2017/texlive-core/series | 1 |
2 files changed, 37 insertions, 0 deletions
diff --git a/src/patchsets/texlive/2017/texlive-core/070_all_luatex_ggc7_align.patch b/src/patchsets/texlive/2017/texlive-core/070_all_luatex_ggc7_align.patch new file mode 100644 index 0000000000..ca48cceae6 --- /dev/null +++ b/src/patchsets/texlive/2017/texlive-core/070_all_luatex_ggc7_align.patch @@ -0,0 +1,36 @@ +https://bugs.gentoo.org/show_bug.cgi?id=621252 +http://www.tug.org/pipermail/tex-live/2017-June/040192.html + +--- + a/texk/web2c/luatexdir/luaffi/ctype.c | 4 ++++ + b/texk/web2c/luatexdir/luaffi/ffi.h | 2 +- + 2 files changed, 5 insertions(+), 1 deletion(-) + +Index: texlive-20170524-source/texk/web2c/luatexdir/luaffi/ctype.c +=================================================================== +--- texlive-20170524-source.orig/texk/web2c/luatexdir/luaffi/ctype.c ++++ texlive-20170524-source/texk/web2c/luatexdir/luaffi/ctype.c +@@ -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); + +Index: texlive-20170524-source/texk/web2c/luatexdir/luaffi/ffi.h +=================================================================== +--- texlive-20170524-source.orig/texk/web2c/luatexdir/luaffi/ffi.h ++++ texlive-20170524-source/texk/web2c/luatexdir/luaffi/ffi.h +@@ -370,7 +370,7 @@ __declspec(align(16)) + #endif + struct cdata { + const struct ctype type +-#ifdef __GNUC__ ++#if 0 /* def __GNUC__ */ + __attribute__ ((aligned(16))) + #endif + ; diff --git a/src/patchsets/texlive/2017/texlive-core/series b/src/patchsets/texlive/2017/texlive-core/series index 7d9ce22744..b3c594899a 100644 --- a/src/patchsets/texlive/2017/texlive-core/series +++ b/src/patchsets/texlive/2017/texlive-core/series @@ -4,3 +4,4 @@ 040_all_remove_define_abs.patch 050_all_latex2man_predictable_tmp.patch 060_all_luatex_zlib.patch +070_all_luatex_ggc7_align.patch |