Apply upstream r294806, remove struct_rtentry_sz on FreeBSD

This should fix build on head after _WANT_RTENTRY removal

6 files changed, 97 insertions, 0 deletions

diff --git a/devel/llvm38/Makefile b/devel/llvm38/Makefile
index 04124634e1e0..4f2f47005474 100644
--- a/devel/llvm38/Makefile
+++ b/devel/llvm38/Makefile
@@ -304,6 +304,7 @@ post-patch:
 
 post-patch-COMPILER_RT-on:
 	cd ${WRKSRC_compiler_rt} && patch < ${PATCHDIR}/compiler-rt-patch-svn-261229
+	cd ${WRKSRC_compiler_rt} && patch < ${PATCHDIR}/compiler-rt-patch-svn-294806
 .if ${ARCH} == "amd64"
 	cd ${WRKSRC_compiler_rt} && patch < ${PATCHDIR}/compiler-rt-patch-no-m32
 .endif
diff --git a/devel/llvm38/files/compiler-rt-patch-svn-294806 b/devel/llvm38/files/compiler-rt-patch-svn-294806
new file mode 100644
index 000000000000..5cffb26d6ed4
--- /dev/null
+++ b/devel/llvm38/files/compiler-rt-patch-svn-294806
@@ -0,0 +1,30 @@
+--- lib/sanitizer_common/sanitizer_platform_limits_posix.cc.orig	2016-06-01 08:17:03 UTC
++++ lib/sanitizer_common/sanitizer_platform_limits_posix.cc
+@@ -23,11 +23,6 @@
+ #ifdef _FILE_OFFSET_BITS
+ #undef _FILE_OFFSET_BITS
+ #endif
+-#if SANITIZER_FREEBSD
+-#define _WANT_RTENTRY
+-#include <sys/param.h>
+-#include <sys/socketvar.h>
+-#endif
+ #include <arpa/inet.h>
+ #include <dirent.h>
+ #include <errno.h>
+@@ -417,6 +412,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(El
+   unsigned struct_input_absinfo_sz = sizeof(struct input_absinfo);
+   unsigned struct_input_id_sz = sizeof(struct input_id);
+   unsigned struct_mtpos_sz = sizeof(struct mtpos);
++  unsigned struct_rtentry_sz = sizeof(struct rtentry);
+   unsigned struct_termio_sz = sizeof(struct termio);
+   unsigned struct_vt_consize_sz = sizeof(struct vt_consize);
+   unsigned struct_vt_sizes_sz = sizeof(struct vt_sizes);
+@@ -436,7 +432,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(El
+   unsigned struct_midi_info_sz = sizeof(struct midi_info);
+   unsigned struct_mtget_sz = sizeof(struct mtget);
+   unsigned struct_mtop_sz = sizeof(struct mtop);
+-  unsigned struct_rtentry_sz = sizeof(struct rtentry);
+   unsigned struct_sbi_instrument_sz = sizeof(struct sbi_instrument);
+   unsigned struct_seq_event_rec_sz = sizeof(struct seq_event_rec);
+   unsigned struct_synth_info_sz = sizeof(struct synth_info);
diff --git a/devel/llvm39/Makefile b/devel/llvm39/Makefile
index 456556710199..e66a1325c9db 100644
--- a/devel/llvm39/Makefile
+++ b/devel/llvm39/Makefile
@@ -314,6 +314,9 @@ post-patch-CLANG-on:
 	${REINPLACE_CMD} -e 's|%%LLVM_PREFIX%%|${LLVM_PREFIX}|' \
 	    ${PATCH_WRKSRC}/tools/clang/lib/Driver/Tools.cpp
 
+post-patch-COMPILER_RT-on:
+	cd ${WRKSRC_compiler_rt} && patch < ${PATCHDIR}/compiler-rt-patch-svn-294806
+
 post-build-COMPILER_RT-on:
 	${MKDIR} ${WRKDIR}/compiler-rt-build
 	cd ${WRKDIR}/compiler-rt-build && \
diff --git a/devel/llvm39/files/compiler-rt-patch-svn-294806 b/devel/llvm39/files/compiler-rt-patch-svn-294806
new file mode 100644
index 000000000000..d6f65632e388
--- /dev/null
+++ b/devel/llvm39/files/compiler-rt-patch-svn-294806
@@ -0,0 +1,30 @@
+--- lib/sanitizer_common/sanitizer_platform_limits_posix.cc.orig	2016-04-26 10:41:30 UTC
++++ lib/sanitizer_common/sanitizer_platform_limits_posix.cc
+@@ -23,11 +23,6 @@
+ #ifdef _FILE_OFFSET_BITS
+ #undef _FILE_OFFSET_BITS
+ #endif
+-#if SANITIZER_FREEBSD
+-#define _WANT_RTENTRY
+-#include <sys/param.h>
+-#include <sys/socketvar.h>
+-#endif
+ #include <arpa/inet.h>
+ #include <dirent.h>
+ #include <errno.h>
+@@ -422,6 +417,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(El
+   unsigned struct_input_absinfo_sz = sizeof(struct input_absinfo);
+   unsigned struct_input_id_sz = sizeof(struct input_id);
+   unsigned struct_mtpos_sz = sizeof(struct mtpos);
++  unsigned struct_rtentry_sz = sizeof(struct rtentry);
+   unsigned struct_termio_sz = sizeof(struct termio);
+   unsigned struct_vt_consize_sz = sizeof(struct vt_consize);
+   unsigned struct_vt_sizes_sz = sizeof(struct vt_sizes);
+@@ -441,7 +437,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(El
+   unsigned struct_midi_info_sz = sizeof(struct midi_info);
+   unsigned struct_mtget_sz = sizeof(struct mtget);
+   unsigned struct_mtop_sz = sizeof(struct mtop);
+-  unsigned struct_rtentry_sz = sizeof(struct rtentry);
+   unsigned struct_sbi_instrument_sz = sizeof(struct sbi_instrument);
+   unsigned struct_seq_event_rec_sz = sizeof(struct seq_event_rec);
+   unsigned struct_synth_info_sz = sizeof(struct synth_info);
diff --git a/devel/llvm40/Makefile b/devel/llvm40/Makefile
index b16cadf30a6e..8b22c408f041 100644
--- a/devel/llvm40/Makefile
+++ b/devel/llvm40/Makefile
@@ -328,6 +328,9 @@ post-patch-CLANG-on:
 	${REINPLACE_CMD} -e 's|%%LLVM_PREFIX%%|${LLVM_PREFIX}|' \
 	    ${PATCH_WRKSRC}/tools/clang/lib/Driver/Tools.cpp
 
+post-patch-COMPILER_RT-on:
+	cd ${WRKSRC_compiler_rt} && patch < ${PATCHDIR}/compiler-rt-patch-svn-294806
+
 post-build-COMPILER_RT-on:
 	${MKDIR} ${WRKDIR}/compiler-rt-build
 	cd ${WRKDIR}/compiler-rt-build && \
diff --git a/devel/llvm40/files/compiler-rt-patch-svn-294806 b/devel/llvm40/files/compiler-rt-patch-svn-294806
new file mode 100644
index 000000000000..9048990527b2
--- /dev/null
+++ b/devel/llvm40/files/compiler-rt-patch-svn-294806
@@ -0,0 +1,30 @@
+--- lib/sanitizer_common/sanitizer_platform_limits_posix.cc.orig	2016-12-20 07:58:49 UTC
++++ lib/sanitizer_common/sanitizer_platform_limits_posix.cc
+@@ -23,11 +23,6 @@
+ #ifdef _FILE_OFFSET_BITS
+ #undef _FILE_OFFSET_BITS
+ #endif
+-#if SANITIZER_FREEBSD
+-#define _WANT_RTENTRY
+-#include <sys/param.h>
+-#include <sys/socketvar.h>
+-#endif
+ #include <arpa/inet.h>
+ #include <dirent.h>
+ #include <errno.h>
+@@ -433,6 +428,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(El
+   unsigned struct_input_absinfo_sz = sizeof(struct input_absinfo);
+   unsigned struct_input_id_sz = sizeof(struct input_id);
+   unsigned struct_mtpos_sz = sizeof(struct mtpos);
++  unsigned struct_rtentry_sz = sizeof(struct rtentry);
+   unsigned struct_termio_sz = sizeof(struct termio);
+   unsigned struct_vt_consize_sz = sizeof(struct vt_consize);
+   unsigned struct_vt_sizes_sz = sizeof(struct vt_sizes);
+@@ -452,7 +448,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(El
+   unsigned struct_midi_info_sz = sizeof(struct midi_info);
+   unsigned struct_mtget_sz = sizeof(struct mtget);
+   unsigned struct_mtop_sz = sizeof(struct mtop);
+-  unsigned struct_rtentry_sz = sizeof(struct rtentry);
+   unsigned struct_sbi_instrument_sz = sizeof(struct sbi_instrument);
+   unsigned struct_seq_event_rec_sz = sizeof(struct seq_event_rec);
+   unsigned struct_synth_info_sz = sizeof(struct synth_info);