diff options
| author | abs <abs@pkgsrc.org> | 2018-10-29 13:55:14 +0000 |
|---|---|---|
| committer | abs <abs@pkgsrc.org> | 2018-10-29 13:55:14 +0000 |
| commit | fc85c4a8781e1ba3459b245c5bce812fe6c0a172 (patch) | |
| tree | 5566e2ab841a5b57524533197054a6cfc6606c7f /fonts/harfbuzz | |
| parent | 354e5c06eb1668bccb3f2186c70db6000837f982 (diff) | |
| download | pkgsrc-fc85c4a8781e1ba3459b245c5bce812fe6c0a172.tar.gz | |
Fix _POSIX_C_SOURCE abuse for at least NetBSD to fix gcc6/7/8 build
Also add USE_GCC_RUNTIME
Bump PKGREVISION
Diffstat (limited to 'fonts/harfbuzz')
| -rw-r--r-- | fonts/harfbuzz/Makefile | 4 | ||||
| -rw-r--r-- | fonts/harfbuzz/distinfo | 3 | ||||
| -rw-r--r-- | fonts/harfbuzz/patches/patch-src_hb-blob.cc | 27 |
3 files changed, 32 insertions, 2 deletions
diff --git a/fonts/harfbuzz/Makefile b/fonts/harfbuzz/Makefile index 0e36e22b377..58b583ee3f1 100644 --- a/fonts/harfbuzz/Makefile +++ b/fonts/harfbuzz/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.98 2018/08/19 17:24:55 wiz Exp $ +# $NetBSD: Makefile,v 1.99 2018/10/29 13:55:14 abs Exp $ DISTNAME= harfbuzz-1.8.8 +PKGREVISION= 1 CATEGORIES= fonts MASTER_SITES= http://www.freedesktop.org/software/harfbuzz/release/ EXTRACT_SUFX= .tar.bz2 @@ -16,6 +17,7 @@ USE_TOOLS+= gmake pkg-config GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-cairo=no CONFIGURE_ARGS+= --with-graphite2=no +USE_GCC_RUNTIME= yes PKGCONFIG_OVERRIDE+= src/harfbuzz.pc.in PKGCONFIG_OVERRIDE+= src/harfbuzz-icu.pc.in diff --git a/fonts/harfbuzz/distinfo b/fonts/harfbuzz/distinfo index 791e5aa3473..8712823cfc0 100644 --- a/fonts/harfbuzz/distinfo +++ b/fonts/harfbuzz/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.77 2018/08/19 17:24:55 wiz Exp $ +$NetBSD: distinfo,v 1.78 2018/10/29 13:55:14 abs Exp $ SHA1 (harfbuzz-1.8.8.tar.bz2) = be496408b2bb3dc794891e8b0e977cd75f02d71d RMD160 (harfbuzz-1.8.8.tar.bz2) = 3b4a94557770bc0aeb7a0a1d7fb3ac2c92830fc5 SHA512 (harfbuzz-1.8.8.tar.bz2) = eb96cd710571a96473b20bc9a01dadf2a3c11224497e52c63368e8edec64a8eb7085dd847c78111b798a1e8a6a950f0a04c930209822aabf13cf86d7a53b1f79 Size (harfbuzz-1.8.8.tar.bz2) = 3862626 bytes +SHA1 (patch-src_hb-blob.cc) = 9f2858357d2a1fc8bf58c98b02041640557f6593 diff --git a/fonts/harfbuzz/patches/patch-src_hb-blob.cc b/fonts/harfbuzz/patches/patch-src_hb-blob.cc new file mode 100644 index 00000000000..6f102224f81 --- /dev/null +++ b/fonts/harfbuzz/patches/patch-src_hb-blob.cc @@ -0,0 +1,27 @@ +$NetBSD: patch-src_hb-blob.cc,v 1.1 2018/10/29 13:55:14 abs Exp $ + +Quoting the URL given in the source: + + The POSIX standard states that a strictly conforming application + "for the C programming language, shall define _POSIX_C_SOURCE to + be 200112L before any header is included." + +Asserting this for only one file out of an application is not defined, +and the standards also explicitly do not apply to c++. + +Its quite possible that some operating systems need _POSIX_C_SOURCE +set to build this file, but its not a general solution, and lets +not do it on NetBSD where is interacts badly with at least gcc-6.4 +7.3 and 8.2 on NetBSD-8/amd64 + +--- src/hb-blob.cc.orig 2018-06-05 22:13:36.000000000 +0000 ++++ src/hb-blob.cc +@@ -26,7 +26,7 @@ + */ + + /* http://www.oracle.com/technetwork/articles/servers-storage-dev/standardheaderfiles-453865.html */ +-#ifndef _POSIX_C_SOURCE ++#if !defined(_POSIX_C_SOURCE) && !defined(__NetBSD__) + #define _POSIX_C_SOURCE 200809L + #endif + |