cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to include-what-you-use-0.15 to support llvm-11

Browse Source 
ok jsg@ (maintainer)
This commit is contained in:
jca 2021-05-13 23:55:12 +00:00
parent 435ee4856c
commit 7129967e74
3 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
devel/include-what-you-use/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.22 2021/02/23 19:39:15 sthen Exp $
# $OpenBSD: Makefile,v 1.23 2021/05/13 23:55:12 jca Exp $
COMMENT= tool to analyse \#includes in C and C++ source files
CATEGORIES= devel
DISTNAME= include-what-you-use-0.14.src
DISTNAME= include-what-you-use-0.15.src
PKGNAME= ${DISTNAME:.src=}
HOMEPAGE= https://include-what-you-use.org
@ -14,8 +14,8 @@ MAINTAINER= Jonathan Gray <jsg@openbsd.org>
# BSD
PERMIT_PACKAGE= Yes
WANTLIB= ${COMPILER_LIBCXX} c m pthread
LLVM_V= 10.0.0
WANTLIB= ${COMPILER_LIBCXX} c clang-cpp m pthread
LLVM_V= 11.1.0
BUILD_DEPENDS= devel/llvm>=${LLVM_V}
RUN_DEPENDS= devel/llvm>=${LLVM_V}
@ -26,6 +26,7 @@ MODPY_ADJ_FILES= *.py
COMPILER= base-clang ports-gcc
COMPILER_LANGS= c++
WRKDIST= ${WRKDIR}
DOCDIR= ${PREFIX}/share/doc/include-what-you-use
do-test:

4
devel/include-what-you-use/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (include-what-you-use-0.14.src.tar.gz) = QxhDl9tXZgwy4ymKax/Vq4LoCKH1qwWR1nRfjSViAO8=
SIZE (include-what-you-use-0.14.src.tar.gz) = 598485
SHA256 (include-what-you-use-0.15.src.tar.gz) = K9byrg125KlBL0aKX6Gvk9XyC7Zrnnv3NHnDHXiawuI=
SIZE (include-what-you-use-0.15.src.tar.gz) = 603123

18
devel/include-what-you-use/patches/patch-iwyu_include_picker_cc
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-iwyu_include_picker_cc,v 1.6 2019/07/06 15:07:55 jca Exp $
$OpenBSD: patch-iwyu_include_picker_cc,v 1.7 2021/05/13 23:55:12 jca Exp $
Index: iwyu_include_picker.cc
--- iwyu_include_picker.cc.orig
+++ iwyu_include_picker.cc
@@ -118,8 +118,6 @@ const IncludeMapEntry libc_symbol_map[] = {
@@ -115,8 +115,6 @@ const IncludeMapEntry libc_symbol_map[] = {
{ "gid_t", kPrivate, "<unistd.h>", kPublic },
{ "id_t", kPrivate, "<sys/types.h>", kPublic },
{ "id_t", kPrivate, "<sys/resource.h>", kPublic },
@ -12,7 +12,7 @@ Index: iwyu_include_picker.cc
{ "ino_t", kPrivate, "<sys/types.h>", kPublic },
{ "ino_t", kPrivate, "<dirent.h>", kPublic },
{ "ino_t", kPrivate, "<sys/stat.h>", kPublic },
@@ -143,8 +141,6 @@ const IncludeMapEntry libc_symbol_map[] = {
@@ -141,8 +139,6 @@ const IncludeMapEntry libc_symbol_map[] = {
{ "mode_t", kPrivate, "<sys/mman.h>", kPublic },
{ "nlink_t", kPrivate, "<sys/types.h>", kPublic },
{ "nlink_t", kPrivate, "<sys/stat.h>", kPublic },
@ -21,9 +21,9 @@ Index: iwyu_include_picker.cc
{ "off_t", kPrivate, "<sys/types.h>", kPublic },
{ "off_t", kPrivate, "<unistd.h>", kPublic },
{ "off_t", kPrivate, "<sys/stat.h>", kPublic },
@@ -158,11 +154,8 @@ const IncludeMapEntry libc_symbol_map[] = {
{ "pid_t", kPrivate, "<time.h>", kPublic },
@@ -157,11 +153,8 @@ const IncludeMapEntry libc_symbol_map[] = {
{ "pid_t", kPrivate, "<utmpx.h>", kPublic },
{ "ptrdiff_t", kPrivate, "<stddef.h>", kPublic },
{ "sigset_t", kPrivate, "<signal.h>", kPublic },
- { "sigset_t", kPrivate, "<sys/epoll.h>", kPublic },
{ "sigset_t", kPrivate, "<sys/select.h>", kPublic },
@ -34,7 +34,7 @@ Index: iwyu_include_picker.cc
{ "ssize_t", kPrivate, "<sys/types.h>", kPublic },
{ "ssize_t", kPrivate, "<unistd.h>", kPublic },
{ "ssize_t", kPrivate, "<monetary.h>", kPublic },
@@ -195,6 +188,7 @@ const IncludeMapEntry libc_symbol_map[] = {
@@ -196,6 +189,7 @@ const IncludeMapEntry libc_symbol_map[] = {
{ "size_t", kPrivate, "<time.h>", kPublic },
{ "size_t", kPrivate, "<uchar.h>", kPublic },
{ "size_t", kPrivate, "<wchar.h>", kPublic },
@ -42,7 +42,7 @@ Index: iwyu_include_picker.cc
// Macros that can be defined in more than one file, don't have the
// same __foo_defined guard that other types do, so the grep above
// doesn't discover them. Until I figure out a better way, I just
@@ -209,6 +203,10 @@ const IncludeMapEntry libc_symbol_map[] = {
@@ -210,6 +204,10 @@ const IncludeMapEntry libc_symbol_map[] = {
{ "calloc", kPrivate, "<stdlib.h>", kPublic },
{ "realloc", kPrivate, "<stdlib.h>", kPublic },
{ "free", kPrivate, "<stdlib.h>", kPublic },
@ -53,7 +53,7 @@ Index: iwyu_include_picker.cc
// Entries for NULL
{ "NULL", kPrivate, "<stddef.h>", kPublic }, // 'canonical' location for NULL
{ "NULL", kPrivate, "<clocale>", kPublic },
@@ -254,7 +252,7 @@ const IncludeMapEntry libstdcpp_symbol_map[] = {
@@ -255,7 +253,7 @@ const IncludeMapEntry libstdcpp_symbol_map[] = {
};
// Private -> public include mappings for GNU libc
@ -62,7 +62,7 @@ Index: iwyu_include_picker.cc
// ( cd /usr/include && grep '^ *# *include' {sys/,net/,}* | perl -nle 'm/^([^:]+).*<([^>]+)>/ && print qq@ { "<$2>", kPrivate, "<$1>", kPublic },@' | grep bits/ | sort )
// When I saw more than one mapping for these, I typically picked
// what I thought was the "best" one.
@@ -457,6 +455,42 @@ const IncludeMapEntry libc_include_map[] = {
@@ -459,6 +457,42 @@ const IncludeMapEntry libc_include_map[] = {
{ "<linux/limits.h>", kPrivate, "<limits.h>", kPublic }, // PATH_MAX
{ "<linux/prctl.h>", kPrivate, "<sys/prctl.h>", kPublic },
{ "<sys/ucontext.h>", kPrivate, "<ucontext.h>", kPublic },