diff options
| author | joerg <joerg@pkgsrc.org> | 2017-06-17 19:45:28 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2017-06-17 19:45:28 +0000 |
| commit | ba762afa1b9d86fa7b8589fe223817c4d41defa1 (patch) | |
| tree | 878bc4bc83fd97f06bfcd2e192e3b38dab9a3ab3 /print | |
| parent | bf6ef7b3d3759d73e7e3fda070fd9b63fde1364b (diff) | |
| download | pkgsrc-ba762afa1b9d86fa7b8589fe223817c4d41defa1.tar.gz | |
Fix the problem with hexdump and LLVM properly. Use .incbin on NetBSD
instead of forcing 8M+ element character array literals through the
compiler.
Diffstat (limited to 'print')
| -rw-r--r-- | print/mupdf/distinfo | 4 | ||||
| -rw-r--r-- | print/mupdf/patches/patch-scripts_hexdump.c | 19 |
2 files changed, 17 insertions, 6 deletions
diff --git a/print/mupdf/distinfo b/print/mupdf/distinfo index 6269d103c83..c931c448b54 100644 --- a/print/mupdf/distinfo +++ b/print/mupdf/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.34 2017/05/28 12:42:21 rumko Exp $ +$NetBSD: distinfo,v 1.35 2017/06/17 19:45:28 joerg Exp $ SHA1 (mupdf-1.11-source.tar.gz) = f782d36aaa896319207e81953e5a622201477b5b RMD160 (mupdf-1.11-source.tar.gz) = 573307473a1ac81aca4519b0e57a7111aae7803f @@ -8,6 +8,6 @@ SHA1 (patch-Makethird) = a4d1bb3c8d509a84803c9b60521fd9b6b17b9717 SHA1 (patch-ab) = a18b1e5b82454bdf06e23185e619b7f8c7a24290 SHA1 (patch-ac) = 9b0c368d05a436f94118efce517fea69c82898e7 SHA1 (patch-ae) = c6b113818b32cb4470e8549c00a16e0b2f364ede -SHA1 (patch-scripts_hexdump.c) = 8e85f3b49590ffc73c6938a67b48b8290ccaac28 +SHA1 (patch-scripts_hexdump.c) = 65a029086f429a1f8568066a712c1d8e0106c867 SHA1 (patch-source_fitz_load-jpx.c) = 773ec1ef6b1632a10ff7c8ff76081e89bdcad593 SHA1 (patch-thirdparty_mujs_Makefile) = cd6a20d56020ae5028f95e24e75f5e4a62127f9f diff --git a/print/mupdf/patches/patch-scripts_hexdump.c b/print/mupdf/patches/patch-scripts_hexdump.c index 1bca10256cd..df64697f670 100644 --- a/print/mupdf/patches/patch-scripts_hexdump.c +++ b/print/mupdf/patches/patch-scripts_hexdump.c @@ -1,7 +1,9 @@ -$NetBSD: patch-scripts_hexdump.c,v 1.1 2017/05/28 12:42:21 rumko Exp $ +$NetBSD: patch-scripts_hexdump.c,v 1.2 2017/06/17 19:45:28 joerg Exp $ -https://bugs.ghostscript.com/show_bug.cgi?id=696828 -Get rid of "error: unexpected token in '.type' directive" on fbsd +GNU as accepts .type without comma, LLVM is stricter. + +Avoid pushing character array with 8M+ elements through the compiler +on NetBSD as well. --- scripts/hexdump.c.orig 2017-04-05 11:02:21.000000000 +0000 +++ scripts/hexdump.c @@ -10,7 +12,16 @@ Get rid of "error: unexpected token in '.type' directive" on fbsd fprintf(fo, "#ifndef __STRICT_ANSI__\n"); - fprintf(fo, "#if defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__)\n"); -+ fprintf(fo, "#if defined(__linux__) || defined(__OpenBSD__)\n"); ++ fprintf(fo, "#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)\n"); fprintf(fo, "#if !defined(__ICC) && !defined(__ANDROID__)\n"); fprintf(fo, "#define HAVE_INCBIN\n"); fprintf(fo, "#endif\n"); +@@ -97,7 +97,7 @@ main(int argc, char **argv) + fprintf(fo, "extern const char fz_%s[];\n", filename); + fprintf(fo, "asm(\".section .rodata\");\n"); + fprintf(fo, "asm(\".global fz_%s\");\n", filename); +- fprintf(fo, "asm(\".type fz_%s STT_OBJECT\");\n", filename); ++ fprintf(fo, "asm(\".type fz_%s, STT_OBJECT\");\n", filename); + fprintf(fo, "asm(\".size fz_%s, %d\");\n", filename, size); + fprintf(fo, "asm(\".balign 64\");\n"); + fprintf(fo, "asm(\"fz_%s:\");\n", filename); |