Sun Dec 31 00:36:05 2017 UTC ()
luatex: gcc-7 fix


(markd)
diff -r1.62 -r1.63 pkgsrc/print/luatex/Makefile
diff -r1.26 -r1.27 pkgsrc/print/luatex/distinfo
diff -r0 -r1.1 pkgsrc/print/luatex/patches/patch-texk_web2c_luatexdir_luaffi_ctype.c
diff -r0 -r1.1 pkgsrc/print/luatex/patches/patch-texk_web2c_luatexdir_luaffi_ffi.h
cvs diff -r1.62 -r1.63 pkgsrc/print/luatex/Makefile (switch to unified diff)

--- pkgsrc/print/luatex/Makefile 2017/09/07 14:17:07 1.62
+++ pkgsrc/print/luatex/Makefile 2017/12/31 00:36:04 1.63
@@ -1,89 +1,89 @@ @@ -1,89 +1,89 @@
1# $NetBSD: Makefile,v 1.62 2017/09/07 14:17:07 tnn Exp $ 1# $NetBSD: Makefile,v 1.63 2017/12/31 00:36:04 markd Exp $
2 2
3DISTNAME= texlive-20170524-source 3DISTNAME= texlive-20170524-source
4PKGNAME= luatex-1.0.4 4PKGNAME= luatex-1.0.4
5PKGREVISION= 4 5PKGREVISION= 5
6CATEGORIES= print 6CATEGORIES= print
7MASTER_SITES= ftp://tug.org/historic/systems/texlive/2017/ 7MASTER_SITES= ftp://tug.org/historic/systems/texlive/2017/
8EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
9 9
10MAINTAINER= minskim@NetBSD.org 10MAINTAINER= minskim@NetBSD.org
11HOMEPAGE= http://www.luatex.org/ 11HOMEPAGE= http://www.luatex.org/
12COMMENT= Extended version of pdfTeX using Lua 12COMMENT= Extended version of pdfTeX using Lua
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
15EXTRACT_ELEMENTS= ${DISTNAME}/build-aux \ 15EXTRACT_ELEMENTS= ${DISTNAME}/build-aux \
16 ${DISTNAME}/libs/lua52 \ 16 ${DISTNAME}/libs/lua52 \
17 ${DISTNAME}/libs/luajit \ 17 ${DISTNAME}/libs/luajit \
18 ${DISTNAME}/libs/poppler \ 18 ${DISTNAME}/libs/poppler \
19 ${DISTNAME}/texk/web2c 19 ${DISTNAME}/texk/web2c
20 20
21GNU_CONFIGURE= yes 21GNU_CONFIGURE= yes
22USE_LANGUAGES= c c++11 22USE_LANGUAGES= c c++11
23USE_LIBTOOL= yes 23USE_LIBTOOL= yes
24USE_TOOLS+= gmake lex perl pkg-config yacc 24USE_TOOLS+= gmake lex perl pkg-config yacc
25CONFIGURE_ARGS+= --disable-aleph --disable-etex --disable-pdftex \ 25CONFIGURE_ARGS+= --disable-aleph --disable-etex --disable-pdftex \
26 --enable-luatex --disable-mf --disable-mf-nowin \ 26 --enable-luatex --disable-mf --disable-mf-nowin \
27 --with-x=no \ 27 --with-x=no \
28 --disable-luajittex --disable-mfluajit \ 28 --disable-luajittex --disable-mfluajit \
29 --disable-mp --disable-pmp --disable-upmp \ 29 --disable-mp --disable-pmp --disable-upmp \
30 --disable-ptex --disable-eptex --disable-uptex --disable-euptex \ 30 --disable-ptex --disable-eptex --disable-uptex --disable-euptex \
31 --disable-web-progs \ 31 --disable-web-progs \
32 --enable-web2c --disable-xetex 32 --enable-web2c --disable-xetex
33#CONFIGURE_ARGS+= --with-system-poppler 33#CONFIGURE_ARGS+= --with-system-poppler
34#CONFIGURE_ARGS+= --with-system-xpdf 34#CONFIGURE_ARGS+= --with-system-xpdf
35CONFIGURE_ARGS+= \ 35CONFIGURE_ARGS+= \
36 --with-fontconfig-includes=${BUILDLINK_PREFIX.fontconfig}/include \ 36 --with-fontconfig-includes=${BUILDLINK_PREFIX.fontconfig}/include \
37 --with-fontconfig-libdir=${BUILDLINK_PREFIX.fontconfig}/lib 37 --with-fontconfig-libdir=${BUILDLINK_PREFIX.fontconfig}/lib
38CONFIGURE_ARGS+= --with-system-kpathsea 38CONFIGURE_ARGS+= --with-system-kpathsea
39CONFIGURE_ARGS+= --with-system-zlib \ 39CONFIGURE_ARGS+= --with-system-zlib \
40 --with-zlib-includes=${BUILDLINK_PREFIX.zlib}/include \ 40 --with-zlib-includes=${BUILDLINK_PREFIX.zlib}/include \
41 --with-zlib-libdir=${BUILDLINK_PREFIX.zlib}/lib 41 --with-zlib-libdir=${BUILDLINK_PREFIX.zlib}/lib
42CONFIGURE_ARGS+= --with-system-cairo 42CONFIGURE_ARGS+= --with-system-cairo
43CONFIGURE_ARGS+= --with-system-pixman 43CONFIGURE_ARGS+= --with-system-pixman
44CONFIGURE_ARGS+= --with-system-libpng 44CONFIGURE_ARGS+= --with-system-libpng
45CONFIGURE_ARGS+= --with-system-freetype2 45CONFIGURE_ARGS+= --with-system-freetype2
46CONFIGURE_ARGS+= --with-system-zziplib 46CONFIGURE_ARGS+= --with-system-zziplib
47CONFIGURE_ARGS+= --with-system-mpfr \ 47CONFIGURE_ARGS+= --with-system-mpfr \
48 --with-mpfr-includes=${BUILDLINK_PREFIX.mpfr}/include \ 48 --with-mpfr-includes=${BUILDLINK_PREFIX.mpfr}/include \
49 --with-mpfr-libdir=${BUILDLINK_PREFIX.mpfr}/lib 49 --with-mpfr-libdir=${BUILDLINK_PREFIX.mpfr}/lib
50CONFIGURE_ARGS+= --with-system-gmp \ 50CONFIGURE_ARGS+= --with-system-gmp \
51 --with-gmp-includes=${BUILDLINK_PREFIX.gmp}/include \ 51 --with-gmp-includes=${BUILDLINK_PREFIX.gmp}/include \
52 --with-gmp-libdir=${BUILDLINK_PREFIX.gmp}/lib 52 --with-gmp-libdir=${BUILDLINK_PREFIX.gmp}/lib
53 53
54CONFIGURE_DIRS= libs/lua52 54CONFIGURE_DIRS= libs/lua52
55CONFIGURE_DIRS+= libs/poppler 55CONFIGURE_DIRS+= libs/poppler
56CONFIGURE_DIRS+= texk/web2c 56CONFIGURE_DIRS+= texk/web2c
57 57
58INSTALLATION_DIRS+= bin lib 58INSTALLATION_DIRS+= bin lib
59 59
60SUBST_CLASSES+= prefix 60SUBST_CLASSES+= prefix
61SUBST_STAGE.prefix= post-configure 61SUBST_STAGE.prefix= post-configure
62SUBST_FILES.prefix= libs/lua52/lua52-src/src/luaconf.h 62SUBST_FILES.prefix= libs/lua52/lua52-src/src/luaconf.h
63SUBST_VARS.prefix= PREFIX 63SUBST_VARS.prefix= PREFIX
64 64
65CFLAGS.SunOS+= -std=gnu99 -D_XOPEN_SOURCE_EXTENDED=0 65CFLAGS.SunOS+= -std=gnu99 -D_XOPEN_SOURCE_EXTENDED=0
66 66
67.include "../../archivers/zziplib/buildlink3.mk" 67.include "../../archivers/zziplib/buildlink3.mk"
68.include "../../devel/zlib/buildlink3.mk" 68.include "../../devel/zlib/buildlink3.mk"
69.include "../../graphics/cairo/buildlink3.mk" 69.include "../../graphics/cairo/buildlink3.mk"
70.include "../../graphics/png/buildlink3.mk" 70.include "../../graphics/png/buildlink3.mk"
71.include "../../math/mpfr/buildlink3.mk" 71.include "../../math/mpfr/buildlink3.mk"
72BUILDLINK_API_DEPENDS.kpathsea+= kpathsea>=6.2.1 72BUILDLINK_API_DEPENDS.kpathsea+= kpathsea>=6.2.1
73.include "../../print/kpathsea/buildlink3.mk" 73.include "../../print/kpathsea/buildlink3.mk"
74#.include "../../print/poppler/buildlink3.mk" 74#.include "../../print/poppler/buildlink3.mk"
75#.include "../../print/poppler-includes/buildlink3.mk" 75#.include "../../print/poppler-includes/buildlink3.mk"
76.include "../../x11/pixman/buildlink3.mk" 76.include "../../x11/pixman/buildlink3.mk"
77 77
78pre-configure: 78pre-configure:
79 # Ensure we generate our patched version 79 # Ensure we generate our patched version
80 ${RM} -f libs/luajit/lj_vm_asm.S 80 ${RM} -f libs/luajit/lj_vm_asm.S
81 81
82do-install: 82do-install:
83 ${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/libs/lua52/libtexlua52.la ${DESTDIR}${PREFIX}/lib 83 ${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/libs/lua52/libtexlua52.la ${DESTDIR}${PREFIX}/lib
84 ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/texk/web2c/luatex ${DESTDIR}${PREFIX}/bin 84 ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/texk/web2c/luatex ${DESTDIR}${PREFIX}/bin
85.for f in texlua texluac 85.for f in texlua texluac
86 ${LN} -s luatex ${DESTDIR}${PREFIX}/bin/${f} 86 ${LN} -s luatex ${DESTDIR}${PREFIX}/bin/${f}
87.endfor 87.endfor
88 88
89.include "../../mk/bsd.pkg.mk" 89.include "../../mk/bsd.pkg.mk"
cvs diff -r1.26 -r1.27 pkgsrc/print/luatex/distinfo (switch to unified diff)

--- pkgsrc/print/luatex/distinfo 2017/08/21 11:14:26 1.26
+++ pkgsrc/print/luatex/distinfo 2017/12/31 00:36:04 1.27
@@ -1,10 +1,12 @@ @@ -1,10 +1,12 @@
1$NetBSD: distinfo,v 1.26 2017/08/21 11:14:26 jperkin Exp $ 1$NetBSD: distinfo,v 1.27 2017/12/31 00:36:04 markd Exp $
2 2
3SHA1 (texlive-20170524-source.tar.xz) = 1c1383ddb1b871c6b8ce49a4ae3c1a33d454a7b6 3SHA1 (texlive-20170524-source.tar.xz) = 1c1383ddb1b871c6b8ce49a4ae3c1a33d454a7b6
4RMD160 (texlive-20170524-source.tar.xz) = a8430c19fe1727cf308fe03e5838105260c0d71e 4RMD160 (texlive-20170524-source.tar.xz) = a8430c19fe1727cf308fe03e5838105260c0d71e
5SHA512 (texlive-20170524-source.tar.xz) = 18c18940992ab94ce22e22ccd4ad798253ea14ac2ab296a10ea5e9a8da9f33989f2e2641b42b564d1d5fb53bd371da3e68726b676d706b469016ad146cd19daa 5SHA512 (texlive-20170524-source.tar.xz) = 18c18940992ab94ce22e22ccd4ad798253ea14ac2ab296a10ea5e9a8da9f33989f2e2641b42b564d1d5fb53bd371da3e68726b676d706b469016ad146cd19daa
6Size (texlive-20170524-source.tar.xz) = 63483372 bytes 6Size (texlive-20170524-source.tar.xz) = 63483372 bytes
7SHA1 (patch-ac) = 1ee83833a03eace2eada892130ddb2198e829f3d 7SHA1 (patch-ac) = 1ee83833a03eace2eada892130ddb2198e829f3d
8SHA1 (patch-libs_luajit_LuaJIT-src_src_host_buildvm__asm.c) = 34fa742ed696f97df637c5086bf1faf3d718cb69 8SHA1 (patch-libs_luajit_LuaJIT-src_src_host_buildvm__asm.c) = 34fa742ed696f97df637c5086bf1faf3d718cb69
9SHA1 (patch-libs_luajit_LuaJIT-src_src_vm__x86.dasc) = 491d33adbbaab8b2b81a65a8d7ba30aee775b75f 9SHA1 (patch-libs_luajit_LuaJIT-src_src_vm__x86.dasc) = 491d33adbbaab8b2b81a65a8d7ba30aee775b75f
10SHA1 (patch-texk_web2c_luatexdir_image_pdftoepdf.w) = 9f7563e5d3011c183092c9eb157560f912113d77 10SHA1 (patch-texk_web2c_luatexdir_image_pdftoepdf.w) = 9f7563e5d3011c183092c9eb157560f912113d77
 11SHA1 (patch-texk_web2c_luatexdir_luaffi_ctype.c) = 57d51564d5dd0200be10154216158fe801d7c630
 12SHA1 (patch-texk_web2c_luatexdir_luaffi_ffi.h) = 2fbf91152fc3438d8e989d5f5f95877faaec6790
File Added: pkgsrc/print/luatex/patches/Attic/patch-texk_web2c_luatexdir_luaffi_ctype.c
$NetBSD: patch-texk_web2c_luatexdir_luaffi_ctype.c,v 1.1 2017/12/31 00:36:04 markd Exp $
gcc-7 fix - Dr. Werner Fink <werner@suse.de>

--- texk/web2c/luatexdir/luaffi/ctype.c.orig	2017-02-10 01:03:59.000000000 +0000
+++ 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);
File Added: pkgsrc/print/luatex/patches/Attic/patch-texk_web2c_luatexdir_luaffi_ffi.h
$NetBSD: patch-texk_web2c_luatexdir_luaffi_ffi.h,v 1.1 2017/12/31 00:36:04 markd Exp $
gcc-7 fix - Dr. Werner Fink <werner@suse.de> 

--- texk/web2c/luatexdir/luaffi/ffi.h.orig	2017-03-11 01:04:06.000000000 +0000
+++ 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
       ;