aboutsummaryrefslogtreecommitdiffstats
path: root/lang
diff options
context:
space:
mode:
authorbrooks <brooks@FreeBSD.org>2014-04-24 04:59:59 +0800
committerbrooks <brooks@FreeBSD.org>2014-04-24 04:59:59 +0800
commit10f2a3c7c22333c060372046393f526e72870e1f (patch)
tree0fd7947268de27d7ad6fe26f68ca4fedc106cb1a /lang
parentd9d776f2f046be8db7360d37fa01e5a143ef6731 (diff)
downloadfreebsd-ports-graphics-10f2a3c7c22333c060372046393f526e72870e1f.tar.gz
freebsd-ports-graphics-10f2a3c7c22333c060372046393f526e72870e1f.tar.zst
freebsd-ports-graphics-10f2a3c7c22333c060372046393f526e72870e1f.zip
Don't install conflicting std*.h and varargs.h files.
Diffstat (limited to 'lang')
-rw-r--r--lang/clang-cheri/Makefile1
-rw-r--r--lang/clang-cheri/files/patch-tools_clang_lib_Headers_CMakeLists.txt22
-rw-r--r--lang/clang-cheri/pkg-plist7
3 files changed, 23 insertions, 7 deletions
diff --git a/lang/clang-cheri/Makefile b/lang/clang-cheri/Makefile
index 5e9b097ae0f..5a09e5304ce 100644
--- a/lang/clang-cheri/Makefile
+++ b/lang/clang-cheri/Makefile
@@ -2,6 +2,7 @@
PORTNAME= clang-cheri
PORTVERSION= 3.4.20140423
+PORTREVISION= 1
CATEGORIES= lang devel
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= brooks
diff --git a/lang/clang-cheri/files/patch-tools_clang_lib_Headers_CMakeLists.txt b/lang/clang-cheri/files/patch-tools_clang_lib_Headers_CMakeLists.txt
new file mode 100644
index 00000000000..da966b78c2e
--- /dev/null
+++ b/lang/clang-cheri/files/patch-tools_clang_lib_Headers_CMakeLists.txt
@@ -0,0 +1,22 @@
+
+$FreeBSD$
+
+--- tools/clang/lib/Headers/CMakeLists.txt.orig
++++ tools/clang/lib/Headers/CMakeLists.txt
+@@ -27,16 +27,9 @@
+ rtmintrin.h
+ shaintrin.h
+ smmintrin.h
+- stdalign.h
+- stdarg.h
+- stdbool.h
+- stddef.h
+- stdint.h
+- stdnoreturn.h
+ tbmintrin.h
+ tgmath.h
+ tmmintrin.h
+- varargs.h
+ wmmintrin.h
+ __wmmintrin_aes.h
+ __wmmintrin_pclmul.h
diff --git a/lang/clang-cheri/pkg-plist b/lang/clang-cheri/pkg-plist
index 303ca940862..531881b832e 100644
--- a/lang/clang-cheri/pkg-plist
+++ b/lang/clang-cheri/pkg-plist
@@ -1464,17 +1464,10 @@ sysroots/cheri-unknown-freebsd/tools/lib/clang/3.5/include/rdseedintrin.h
sysroots/cheri-unknown-freebsd/tools/lib/clang/3.5/include/rtmintrin.h
sysroots/cheri-unknown-freebsd/tools/lib/clang/3.5/include/shaintrin.h
sysroots/cheri-unknown-freebsd/tools/lib/clang/3.5/include/smmintrin.h
-sysroots/cheri-unknown-freebsd/tools/lib/clang/3.5/include/stdalign.h
-sysroots/cheri-unknown-freebsd/tools/lib/clang/3.5/include/stdarg.h
-sysroots/cheri-unknown-freebsd/tools/lib/clang/3.5/include/stdbool.h
-sysroots/cheri-unknown-freebsd/tools/lib/clang/3.5/include/stddef.h
-sysroots/cheri-unknown-freebsd/tools/lib/clang/3.5/include/stdint.h
-sysroots/cheri-unknown-freebsd/tools/lib/clang/3.5/include/stdnoreturn.h
sysroots/cheri-unknown-freebsd/tools/lib/clang/3.5/include/tbmintrin.h
sysroots/cheri-unknown-freebsd/tools/lib/clang/3.5/include/tgmath.h
sysroots/cheri-unknown-freebsd/tools/lib/clang/3.5/include/tmmintrin.h
sysroots/cheri-unknown-freebsd/tools/lib/clang/3.5/include/unwind.h
-sysroots/cheri-unknown-freebsd/tools/lib/clang/3.5/include/varargs.h
sysroots/cheri-unknown-freebsd/tools/lib/clang/3.5/include/wmmintrin.h
sysroots/cheri-unknown-freebsd/tools/lib/clang/3.5/include/x86intrin.h
sysroots/cheri-unknown-freebsd/tools/lib/clang/3.5/include/xmmintrin.h