1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-19 19:59:43 +00:00

Apply upstream r294806, remove struct_rtentry_sz on FreeBSD

This should fix build on head after _WANT_RTENTRY removal
This commit is contained in:
Antoine Brodin 2017-02-11 16:24:33 +00:00
parent 9ac67b4d86
commit 8cfbf1bf9e
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=433889
2 changed files with 32 additions and 1 deletions

View File

@ -55,7 +55,8 @@ CLANG_PORTDOCS= clang
COMPILER_RT_DESC= Build compiler-rt (sanitizers)
COMPILER_RT_DISTFILES= compiler-rt-${DISTVERSION}.src${EXTRACT_SUFX}
COMPILER_RT_EXTRA_PATCHES= \
${PATCHDIR}/compiler-rt-patch-svn-249051
${PATCHDIR}/compiler-rt-patch-svn-249051 \
${PATCHDIR}/compiler-rt-patch-svn-294806
DOCS_PORTDOCS= llvm
DOCS_CMAKE_ON= -DLLVM_ENABLE_SPHINX=ON \
-DSPHINX_WARNINGS_AS_ERRORS=OFF \

View File

@ -0,0 +1,30 @@
--- tools/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc.orig 2015-06-25 20:50:18 UTC
+++ tools/compiler-rt/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>
@@ -374,6 +369,7 @@ namespace __sanitizer {
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);
@@ -393,7 +389,6 @@ namespace __sanitizer {
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);